W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-04 15:22:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix group cleanup

Browse Source
This commit is contained in:
icomrade
2014-06-13 13:15:14 -04:00
parent b43a8f8390
commit b113c2e353
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SQF/dayz_server/init/server_functions.sqf
View File

@@ -146,7 +146,9 @@ eh_localCleanup = {
_unit removeAllEventHandlers "Local"; _unit removeAllEventHandlers "Local";
clearVehicleInit _unit; clearVehicleInit _unit;
deleteVehicle _unit; deleteVehicle _unit;
if ((count (units _myGroupUnit) == 0) && (_myGroupUnit != grpNull)) then {
deleteGroup _myGroupUnit; deleteGroup _myGroupUnit;
};
//_unit = nil; //_unit = nil;
// diag_log ("CLEANUP: DELETED A " + str(_type) ); // diag_log ("CLEANUP: DELETED A " + str(_type) );
}; };
@@ -622,6 +624,7 @@ dayz_recordLogin = {
dayz_perform_purge = { dayz_perform_purge = {
if(!isNull(_this)) then { if(!isNull(_this)) then {
_group = group _this;
_this removeAllMPEventHandlers "mpkilled"; _this removeAllMPEventHandlers "mpkilled";
_this removeAllMPEventHandlers "mphit"; _this removeAllMPEventHandlers "mphit";
_this removeAllMPEventHandlers "mprespawn"; _this removeAllMPEventHandlers "mprespawn";
@@ -634,7 +637,9 @@ dayz_perform_purge = {
_this removeAllEventHandlers "Local"; _this removeAllEventHandlers "Local";
clearVehicleInit _this; clearVehicleInit _this;
deleteVehicle _this; deleteVehicle _this;
deleteGroup (group _this); if ((count (units _group) == 0) && (_group != grpNull)) then {
deleteGroup _group;
};
}; };
}; };
@@ -695,7 +700,7 @@ dayz_perform_purge_player = {
{ {
_holder addMagazineCargoGlobal [_x, 1]; _holder addMagazineCargoGlobal [_x, 1];
} count _magazines; } count _magazines;
_group = group _this;
_this removeAllMPEventHandlers "mpkilled"; _this removeAllMPEventHandlers "mpkilled";
_this removeAllMPEventHandlers "mphit"; _this removeAllMPEventHandlers "mphit";
_this removeAllMPEventHandlers "mprespawn"; _this removeAllMPEventHandlers "mprespawn";
@@ -708,13 +713,16 @@ dayz_perform_purge_player = {
_this removeAllEventHandlers "Local"; _this removeAllEventHandlers "Local";
clearVehicleInit _this; clearVehicleInit _this;
deleteVehicle _this; deleteVehicle _this;
deleteGroup (group _this); if ((count (units _group) == 0) && (_group != grpNull)) then {
deleteGroup _group;
};
// _this = nil; // _this = nil;
}; };
dayz_removePlayerOnDisconnect = { dayz_removePlayerOnDisconnect = {
if(!isNull(_this)) then { if(!isNull(_this)) then {
_group = group _this;
_this removeAllMPEventHandlers "mphit"; _this removeAllMPEventHandlers "mphit";
deleteVehicle _this; deleteVehicle _this;
deleteGroup (group _this); deleteGroup (group _this);
@@ -780,7 +788,7 @@ server_cleanupGroups = {
if(!isNil "DZE_DYN_GroupCleanup") exitWith { DZE_DYN_AntiStuck3rd = DZE_DYN_AntiStuck3rd + 1;}; if(!isNil "DZE_DYN_GroupCleanup") exitWith { DZE_DYN_AntiStuck3rd = DZE_DYN_AntiStuck3rd + 1;};
DZE_DYN_GroupCleanup = true; DZE_DYN_GroupCleanup = true;
{ {
if (count units _x == 0) then { if ((count (units _x) == 0) && (_x != grpNull)) then {
deleteGroup _x; deleteGroup _x;
}; };
sleep 0.001; sleep 0.001;