From ad1c90ee3648bf47572c5d93be9d9eb31f8c6597 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Thu, 31 Oct 2013 19:02:41 -0500 Subject: [PATCH] same --- SQF/dayz_code/actions/player_addToolbelt.sqf | 2 +- SQF/dayz_server/compile/server_onPlayerDisconnect.sqf | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/SQF/dayz_code/actions/player_addToolbelt.sqf b/SQF/dayz_code/actions/player_addToolbelt.sqf index 42df4fe83..812706f6c 100644 --- a/SQF/dayz_code/actions/player_addToolbelt.sqf +++ b/SQF/dayz_code/actions/player_addToolbelt.sqf @@ -54,7 +54,7 @@ if (_isOk) then { player addMagazine 'sledge_swing'; }; if (_create == "MeleeHatchet") then { - player addMagazine 'hatchet_swing'; + player addMagazine 'Hatchet_swing'; }; if (_create == "MeleeMachete") then { player addMagazine 'Machete_swing'; diff --git a/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf b/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf index fd1226be3..03bcb6b2c 100644 --- a/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf +++ b/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf @@ -1,4 +1,4 @@ -private ["_invehicle","_isplayernearby","_object","_myGroup","_id","_playerID","_playerName","_characterID","_playerIDtoarray","_timeout","_message"]; +private ["_invehicle","_isplayernearby","_object","_myGroup","_id","_playerID","_playerName","_characterID","_playerIDtoarray","_timeout","_message","_magazines"]; _playerID = _this select 0; _playerName = _this select 1; _object = call compile format["player%1",_playerID]; @@ -40,7 +40,11 @@ if (!isNull _object) then { if (alive _object) then { _isplayernearby = (DZE_BackpackGuard and!_invehicle and ({isPlayer _x} count (_object nearEntities ["AllVehicles", 5]) > 1)); - [_object,(magazines _object),true,true,_isplayernearby] call server_playerSync; + + // prevent saving more than 20 magazine items + _magazines = [(magazines _object),20] call array_reduceSize; + + [_object,_magazines,true,true,_isplayernearby] call server_playerSync; // maybe not needed just testing _object removeAllEventHandlers "MPHit";