From 38f5f618e08bba633ea5cbb2de23d7e92286a3d3 Mon Sep 17 00:00:00 2001 From: oiad Date: Wed, 1 Jul 2020 08:27:21 +1200 Subject: [PATCH] Fix lockables not inheriting damage on unlock/lock This causes problems with maintaining since the unlocked lockables won't inherit any damage so they won't be maintained unless it's force maintained --- SQF/dayz_server/compile/server_handleSafeGear.sqf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/SQF/dayz_server/compile/server_handleSafeGear.sqf b/SQF/dayz_server/compile/server_handleSafeGear.sqf index a6d31483c..fb8350a87 100644 --- a/SQF/dayz_server/compile/server_handleSafeGear.sqf +++ b/SQF/dayz_server/compile/server_handleSafeGear.sqf @@ -1,4 +1,4 @@ -private ["_backpacks","_charID","_clientID","_dir","_holder","_lockCode","_lockedClass","_magazines","_name","_obj","_objectID","_objectUID","_ownerID","_packedClass","_player","_playerUID","_pos","_status","_statusText","_type","_unlockedClass","_vector","_weapons","_message","_suppliedCode"]; +private ["_backpacks","_charID","_clientID","_dir","_holder","_lockCode","_lockedClass","_magazines","_name","_obj","_objectID","_objectUID","_ownerID","_packedClass","_player","_playerUID","_pos","_status","_statusText","_type","_unlockedClass","_vector","_weapons","_message","_suppliedCode","_damage"]; _player = _this select 0; _obj = _this select 1; @@ -50,6 +50,7 @@ call { _weapons = _obj getVariable ["WeaponCargo",[]]; _magazines = _obj getVariable ["MagazineCargo",[]]; _backpacks = _obj getVariable ["BackpackCargo",[]]; + _damage = damage _obj; // Create new unlocked safe, then delete old locked safe _holder = _unlockedClass createVehicle [0,0,0]; @@ -61,6 +62,7 @@ call { _holder setVariable ["ObjectID",_objectID,true]; _holder setVariable ["ObjectUID",_objectUID,true]; _holder setVariable ["OEMPos",_pos,true]; + _holder setDamage _damage; if (DZE_permanentPlot) then {_holder setVariable ["ownerPUID",_ownerID,true];}; deleteVehicle _obj; @@ -74,6 +76,7 @@ call { _weapons = getWeaponCargo _obj; _magazines = getMagazineCargo _obj; _backpacks = getBackpackCargo _obj; + _damage = damage _obj; // Create new locked safe, then delete old unlocked safe _holder = _lockedClass createVehicle [0,0,0]; @@ -85,6 +88,7 @@ call { _holder setVariable ["ObjectID",_objectID,true]; _holder setVariable ["ObjectUID",_objectUID,true]; _holder setVariable ["OEMPos",_pos,true]; + _holder setDamage _damage; if (DZE_permanentPlot) then {_holder setVariable ["ownerPUID",_ownerID,true];}; deleteVehicle _obj;