Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX: CBA_fnc_deleteEntity looping over network and kill dedicated server #940

Merged
merged 3 commits into from
Jun 30, 2018
Merged

FIX: CBA_fnc_deleteEntity looping over network and kill dedicated server #940

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a4c93c
FIX: particular case when groupowner return 0
Vdauphin Jun 23, 2018
450b006
No timeout is necessary since groupowner is always switching to a ser…
Vdauphin Jun 23, 2018
dacfa6d
quit waitUntil should group be deleted by other means
commy2 Jun 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions addons/common/fnc_deleteEntity.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,14 @@ switch (typeName _entity) do {
deleteGroup _entity;
} else {
if (isServer) then {
_entity remoteExecCall ["CBA_fnc_deleteEntity", groupOwner _entity];
private _groupOwner = groupOwner _entity;
if (_groupOwner isEqualTo 0) then {
[{groupOwner _this != 0 || isNull _this}, {
_this call CBA_fnc_deleteEntity;
}, _entity] call CBA_fnc_waitUntilAndExecute;
} else {
_entity remoteExecCall ["CBA_fnc_deleteEntity", _groupOwner];
};
} else {
_entity remoteExecCall ["CBA_fnc_deleteEntity", 2];
};
Expand All @@ -57,7 +64,7 @@ switch (typeName _entity) do {
deleteLocation _entity;
};
case "STRING" : {
deleteMarker _entity
deleteMarker _entity;
};
default {};
};