diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf index b68bcae18..db681fb75 100644 --- a/SQF/dayz_code/compile/fn_selfActions.sqf +++ b/SQF/dayz_code/compile/fn_selfActions.sqf @@ -8,6 +8,17 @@ private ["_isWreckBuilding","_temp_keys","_magazinesPlayer","_isPZombie","_vehic if (DZE_ActionInProgress) exitWith {}; // Do not allow if any script is running. +_groups = allGroups; +//Clean groups +{ + if (_x == group player) then { + diag_log ("Player In Group" + str(_x) + " WITH " + str(count units _x) + " UNITS"); + } else { + diag_log ("Player NotIn Group" + str(_x) + " WITH " + str(count units _x) + " UNITS"); + }; + diag_log ("Units" + str(units _x)); +} forEach _groups; + _vehicle = vehicle player; _isPZombie = player isKindOf "PZombie_VB"; _inVehicle = (_vehicle != player); diff --git a/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf b/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf index 3d51abcf4..15b189429 100644 --- a/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf +++ b/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf @@ -23,6 +23,7 @@ if (!isNull _playerObj) then { if (vehicle _playerObj != _playerObj) then { _playerObj action ["eject", vehicle _playerObj]; _invehicle = true; + diag_log format["LOGOUT IN VEHICLE: %1 at location %2", _playerName,(getPosATL _playerObj)]; }; if ((_timeout - time) > 0) then { @@ -44,7 +45,7 @@ if (!isNull _playerObj) then { if (alive _playerObj) then { - _isplayernearby = (DZE_BackpackGuard and!_invehicle and ({(isPlayer _x) and (alive _x)} count (_playerPos nearEntities ["AllVehicles", 5]) > 1)); + _isplayernearby = (DZE_BackpackGuard and !_invehicle and ({(isPlayer _x) and (alive _x)} count (_playerPos nearEntities ["AllVehicles", 5]) > 1)); // prevent saving more than 20 magazine items _magazines = [(magazines _playerObj),20] call array_reduceSize; diff --git a/SQF/dayz_server/system/server_cleanup.fsm b/SQF/dayz_server/system/server_cleanup.fsm index 80ebc3d13..8900374fd 100644 --- a/SQF/dayz_server/system/server_cleanup.fsm +++ b/SQF/dayz_server/system/server_cleanup.fsm @@ -21,11 +21,11 @@ item16[] = {"group_cleanup",2,250,-450.000000,25.000000,-350.000000,75.000000,0. item17[] = {"__0_min__loop_1",4,218,50.000000,-75.000000,150.000000,-25.000000,5.000000,"10 min" \n " loop"}; item18[] = {"cleanup_dead",2,250,50.000000,25.000000,150.000000,75.000000,0.000000,"cleanup" \n "dead"}; item19[] = {"___min__loop",4,218,-200.000000,-75.000000,-100.000000,-25.000000,3.000000,"1 min" \n " loop"}; -item20[] = {"cleanup_loot",2,4346,-200.000000,25.000000,-100.000000,75.000000,0.000000,"cleanup" \n "loot"}; +item20[] = {"cleanup_loot",2,250,-200.000000,25.000000,-100.000000,75.000000,0.000000,"cleanup" \n "loot"}; item21[] = {"__5_min__loop",4,218,175.000000,-75.000000,275.000000,-25.000000,6.000000,"15 min" \n " loop"}; item22[] = {"cleanup_animals",2,250,175.000000,25.000000,275.000000,75.000000,0.000000,"cleanup" \n "animals and fire"}; item23[] = {"__0_min__loop",4,218,300.000000,-75.000000,400.000000,-25.000000,7.000000,"30 min" \n " loop"}; -item24[] = {"cleanup_null",2,250,300.000000,25.000000,400.000000,75.000000,0.000000,"cleanup" \n "null"}; +item24[] = {"cleanup_null",2,4346,300.000000,25.000000,400.000000,75.000000,0.000000,"cleanup" \n "null"}; link0[] = {0,11}; link1[] = {1,2}; link2[] = {2,3}; @@ -59,7 +59,7 @@ link29[] = {22,5}; link30[] = {23,24}; link31[] = {24,5}; globals[] = {25.000000,1,0,0,0,640,480,1,42,6316128,1,-508.946564,440.498199,435.888916,-341.331024,861,880,1}; -window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,879}; +window[] = {2,-1,-1,-1,-1,1020,208,1500,208,3,879}; *//*%FSM*/ class FSM { @@ -392,7 +392,7 @@ class FSM class cleanup_null { name = "cleanup_null"; - init = /*%FSM*/"[] spawn server_spawnCleanNull;"/*%FSM*/; + init = /*%FSM*/"// [] spawn server_spawnCleanNull;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links {