diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt index b17549fb8..95053b6cd 100644 --- a/CHANGE LOG 1.0.6.txt +++ b/CHANGE LOG 1.0.6.txt @@ -87,6 +87,8 @@ [FIXED] Keyboard input is now disabled properly while unconscious @skynetdev @ebaydayz #1613 [FIXED] Toilet paper dupe exploit when building outhouse @Markokil321 @ebaydayz #1599 [FIXED] Safes and lockboxes wiped when opening after restart and locking not being logged to RPT @ebaydayz #1413 #1503 +[FIXED] Greatly optimized safe gear handling. Safe inventories are no longer sent to all machines over the network on server startup and each lock/unlock. @ebaydayz +[FIXED] User input is disabled and then gear dialog is closed during safe lock/unlock/pack to block various duping methods. #1341 @RimBlock @ebaydayz [FIXED] Duplicate objectUIDs occasionally causing vehicles to swap classes or be deleted across restarts @ebaydayz @icomrade #1504 [FIXED] DZE_BuildingLimit now counts buildables only instead of all object types. Thanks jOoPs @ebaydayz [FIXED] Reworked death messages. Fixed messages not always showing, undefined errors and wrong distance bug. Added bled out, killed by zombie, etc. MPHit event handler (fnc_plyrHit) is no longer needed. @ebaydayz diff --git a/SQF/dayz_code/compile/fn_waitForObject.sqf b/SQF/dayz_code/compile/fn_waitForObject.sqf index bdbbe213e..9668e729d 100644 --- a/SQF/dayz_code/compile/fn_waitForObject.sqf +++ b/SQF/dayz_code/compile/fn_waitForObject.sqf @@ -1,3 +1,14 @@ +/* + 1. Waits for an object to be created and then reveals it to the player. + 2. Optionally deletes a temporary sign or marker placeholder object. + + Parameters: + _this select 0: string - object class name to reveal + _this select 1: object - sign object or ObjNull if none + + ["objectClassName", objNull] spawn fn_waitForObject; +*/ + private ["_object","_sign"]; _object = _this select 0; @@ -8,5 +19,8 @@ waitUntil { !isNull (nearestObject [player,_object]) }; -deleteVehicle _sign; +if (!isNull _sign) then { + deleteVehicle _sign; +}; + player reveal (nearestObject [player,_object]); \ No newline at end of file diff --git a/SQF/dayz_code/compile/player_lockVault.sqf b/SQF/dayz_code/compile/player_lockVault.sqf index 6c770a624..99f5a7b99 100644 --- a/SQF/dayz_code/compile/player_lockVault.sqf +++ b/SQF/dayz_code/compile/player_lockVault.sqf @@ -3,7 +3,7 @@ Usage: [_obj] spawn player_unlockVault; Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com. */ -private ["_objectID","_objectUID","_obj","_ownerID","_dir","_pos","_holder","_weapons","_magazines","_backpacks","_alreadyPacking","_lockedClass","_text","_playerNear","_combination","_ComboMatch","_objType","_charID","_vector"]; +private ["_obj","_ownerID","_alreadyPacking","_text","_playerNear","_ComboMatch","_objType"]; if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_10" call dayz_rollingMessages;}; DZE_ActionInProgress = true; @@ -17,7 +17,7 @@ _lockedClass = getText (configFile >> "CfgVehicles" >> _objType >> "lockedClass" _text = getText (configFile >> "CfgVehicles" >> _objType >> "displayName"); // Silently exit if object no longer exists -if(isNull _obj) exitWith { DZE_ActionInProgress = false; }; +if (isNull _obj) exitWith { DZE_ActionInProgress = false; }; ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; player playActionNow "Medic"; uiSleep 1; @@ -28,61 +28,28 @@ _playerNear = _obj call dze_isnearest_player; if (_playerNear) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_11" call dayz_rollingMessages;}; _ownerID = _obj getVariable["CharacterID","0"]; -_charID = _ownerID; -_objectID = _obj getVariable["ObjectID","0"]; -_objectUID = _obj getVariable["ObjectUID","0"]; _ComboMatch = (_ownerID == dayz_combination); -if (DZE_permanentPlot) then { - _combination = _obj getVariable["characterID","0"]; - _ownerID = _obj getVariable["ownerPUID","0"]; - _ComboMatch = (_combination == dayz_combination); -}; -if(!_ComboMatch && (_ownerID != dayz_playerUID)) exitWith {DZE_ActionInProgress = false; s_player_lockvault = -1; format[localize "str_epoch_player_115",_text] call dayz_rollingMessages; }; +if (DZE_permanentPlot) then {_ownerID = _obj getVariable["ownerPUID","0"];}; + +if (!_ComboMatch && (_ownerID != dayz_playerUID)) exitWith {DZE_ActionInProgress = false; s_player_lockvault = -1; format[localize "str_epoch_player_115",_text] call dayz_rollingMessages; }; _alreadyPacking = _obj getVariable["packing",0]; if (_alreadyPacking == 1) exitWith {DZE_ActionInProgress = false; s_player_lockvault = -1; format[localize "str_epoch_player_116",_text] call dayz_rollingMessages;}; _obj setVariable["packing",1]; -_dir = direction _obj; -_vector = [(vectorDir _obj),(vectorUp _obj)]; -_pos = _obj getVariable["OEMPos",(getposATL _obj)]; - if (!isNull _obj) then { + disableUserInput true; // Make sure player can not modify gear while it is being saved + (findDisplay 106) closeDisplay 0; // Close gear dze_waiting = nil; - PVDZE_log_lockUnlock = [player, _obj,true]; - publicVariableServer "PVDZE_log_lockUnlock"; + PVDZE_handleSafeGear = [player,_obj,1]; + publicVariableServer "PVDZE_handleSafeGear"; //wait for response from server to verify safe was logged and saved before proceeding waitUntil {!isNil "dze_waiting"}; + disableUserInput false; // Safe is done saving now - //place vault - _holder = createVehicle [_lockedClass,_pos,[], 0, "CAN_COLLIDE"]; - _holder setdir _dir; - _holder setVariable["memDir",_dir,true]; - _holder setVectorDirAndUp _vector; - _holder setPosATL _pos; - player reveal _holder; - - _holder setVariable["CharacterID",_charID,true]; - _holder setVariable["ObjectID",_objectID,true]; - _holder setVariable["ObjectUID",_objectUID,true]; - _holder setVariable ["OEMPos", _pos, true]; - if (DZE_permanentPlot) then { - _holder setVariable ["ownerPUID", _ownerID , true]; - }; - - _weapons = getWeaponCargo _obj; - _magazines = getMagazineCargo _obj; - _backpacks = getBackpackCargo _obj; - - // remove vault - deleteVehicle _obj; - - // Fill variables with loot - _holder setVariable ["WeaponCargo", _weapons, true]; - _holder setVariable ["MagazineCargo", _magazines, true]; - _holder setVariable ["BackpackCargo", _backpacks, true]; + [_lockedClass,objNull] spawn fn_waitForObject; format[localize "str_epoch_player_117",_text] call dayz_rollingMessages; }; s_player_lockvault = -1; -DZE_ActionInProgress = false; +DZE_ActionInProgress = false; \ No newline at end of file diff --git a/SQF/dayz_code/compile/player_packVault.sqf b/SQF/dayz_code/compile/player_packVault.sqf index 50e6479b8..f38f56ced 100644 --- a/SQF/dayz_code/compile/player_packVault.sqf +++ b/SQF/dayz_code/compile/player_packVault.sqf @@ -1,45 +1,35 @@ /* [_obj] spawn player_packVault; */ -private ["_activatingPlayer","_obj","_ownerID","_objectID","_objectUID","_alreadyPacking","_location1","_location2","_dir","_pos","_bag","_holder","_weapons","_magazines","_backpacks","_objWpnTypes","_objWpnQty","_countr","_packedClass","_text","_playerNear"]; +private ["_obj","_ownerID","_objectID","_objectUID","_alreadyPacking","_location1","_location2","_packedClass","_text","_playerNear"]; if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_15" call dayz_rollingMessages;}; DZE_ActionInProgress = true; -_activatingPlayer = player; - _obj = _this; - _packedClass = getText (configFile >> "CfgVehicles" >> (typeOf _obj) >> "packedClass"); -_text = getText (configFile >> "CfgVehicles" >> (typeOf _obj) >> "displayName"); - +_text = getText (configFile >> "CfgVehicles" >> (typeOf _obj) >> "displayName"); // Silently exit if object no longer exists -if(isNull _obj || !(alive _obj)) exitWith { DZE_ActionInProgress = false; }; +if (isNull _obj || !(alive _obj)) exitWith { DZE_ActionInProgress = false; }; _playerNear = _obj call dze_isnearest_player; - -if(_playerNear) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_16" call dayz_rollingMessages;}; +if (_playerNear) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_16" call dayz_rollingMessages;}; _ownerID = _obj getVariable["CharacterID","0"]; -_objectID = _obj getVariable["ObjectID","0"]; -_objectUID = _obj getVariable["ObjectUID","0"]; +_objectID = _obj getVariable["ObjectID","0"]; +_objectUID = _obj getVariable["ObjectUID","0"]; _ComboMatch = (_ownerID == dayz_combination); -if (DZE_permanentPlot) then { - _combination = _obj getVariable["characterID","0"]; - _ownerID = _obj getVariable["ownerPUID","0"]; - _ComboMatch = (_combination == dayz_combination); -}; +if (DZE_permanentPlot) then {_ownerID = _obj getVariable["ownerPUID","0"];}; player removeAction s_player_packvault; s_player_packvault = 1; -if(_objectID == "0" && _objectUID == "0") exitWith {DZE_ActionInProgress = false; s_player_packvault = -1; format[localize "str_epoch_player_118",_text] call dayz_rollingMessages;}; +if (_objectID == "0" && _objectUID == "0") exitWith {DZE_ActionInProgress = false; s_player_packvault = -1; format[localize "str_epoch_player_118",_text] call dayz_rollingMessages;}; -if(!_ComboMatch && (_ownerID != dayz_playerUID)) exitWith { DZE_ActionInProgress = false; s_player_packvault = -1; format[localize "str_epoch_player_119",_text] call dayz_rollingMessages;}; +if (!_ComboMatch && (_ownerID != dayz_playerUID)) exitWith { DZE_ActionInProgress = false; s_player_packvault = -1; format[localize "str_epoch_player_119",_text] call dayz_rollingMessages;}; _alreadyPacking = _obj getVariable["packing",0]; - if (_alreadyPacking == 1) exitWith {DZE_ActionInProgress = false; s_player_packvault = -1; format[localize "str_epoch_player_120",_text] call dayz_rollingMessages;}; _obj setVariable["packing",1]; @@ -56,73 +46,24 @@ if(_location1 distance _location2 > 0.1) exitWith { DZE_ActionInProgress = false; }; - -_dir = direction _obj; -_pos = _obj getVariable["OEMPos",(getposATL _obj)]; - -if(!isNull _obj && alive _obj) then { - +if (!isNull _obj && alive _obj) then { ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; player playActionNow "Medic"; [player,"tentpack",0,false] call dayz_zombieSpeak; uiSleep 3; - - _weapons = getWeaponCargo _obj; - _magazines = getMagazineCargo _obj; - _backpacks = getBackpackCargo _obj; - // Remove from database - PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer]; - publicVariableServer "PVDZ_obj_Destroy"; - - // Set down vault "take" item - _bag = createVehicle [_packedClass,_pos,[], 0, "CAN_COLLIDE"]; - - // Delete original - deleteVehicle _obj; - - _bag setdir _dir; - _bag setposATL _pos; - player reveal _bag; - - // Empty weapon holder - _holder = _bag; - - // add seed item - _itemOut = getText(configFile >> "CfgVehicles" >> _packedClass >> "seedItem"); - _countOut = 1; - _holder addMagazineCargoGlobal[_itemOut, _countOut]; - - //Add weapons - _objWpnTypes = _weapons select 0; - _objWpnQty = _weapons select 1; - _countr = 0; - { - _holder addweaponcargoGlobal [_x,(_objWpnQty select _countr)]; - _countr = _countr + 1; - } count _objWpnTypes; - - //Add Magazines - _objWpnTypes = _magazines select 0; - _objWpnQty = _magazines select 1; - _countr = 0; - { - _holder addmagazinecargoGlobal [_x,(_objWpnQty select _countr)]; - _countr = _countr + 1; - } count _objWpnTypes; - - //Add Backpacks - _objWpnTypes = _backpacks select 0; - _objWpnQty = _backpacks select 1; - _countr = 0; - { - _holder addbackpackcargoGlobal [_x,(_objWpnQty select _countr)]; - _countr = _countr + 1; - } count _objWpnTypes; + disableUserInput true; // Make sure player can not modify gear while it is being added + (findDisplay 106) closeDisplay 0; // Close gear + dze_waiting = nil; + PVDZE_handleSafeGear = [player,_obj,2]; + publicVariableServer "PVDZE_handleSafeGear"; + //wait for response from server to verify pack was logged and gear added before proceeding + waitUntil {!isNil "dze_waiting"}; + disableUserInput false; // Gear is done being added now + + [_packedClass,objNull] spawn fn_waitForObject; format[localize "str_epoch_player_123",_text] call dayz_rollingMessages; - - player action ["Gear", _holder]; }; s_player_packvault = -1; DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/compile/player_unlockVault.sqf b/SQF/dayz_code/compile/player_unlockVault.sqf index f6f820f23..6cb3d2612 100644 --- a/SQF/dayz_code/compile/player_unlockVault.sqf +++ b/SQF/dayz_code/compile/player_unlockVault.sqf @@ -3,7 +3,7 @@ Usage: [_obj] spawn player_unlockVault; Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com. */ -private ["_objectID","_objectUID","_obj","_ownerID","_dir","_pos","_holder","_weapons","_magazines","_backpacks","_objWpnTypes","_objWpnQty","_countr","_alreadyPacking","_playerNear","_playerID","_claimedBy","_unlockedClass","_text","_objType","_combination","_ComboMatch","_vector","_characterID"]; +private ["_obj","_ownerID","_alreadyPacking","_playerNear","_playerID","_claimedBy","_text","_objType","_ComboMatch"]; if (DZE_ActionInProgress) exitWith {localize "str_epoch_player_21" call dayz_rollingMessages;}; DZE_ActionInProgress = true; @@ -32,19 +32,12 @@ _text = getText (configFile >> "CfgVehicles" >> _objType >> "displayName"); _alreadyPacking = _obj getVariable["packing",0]; _claimedBy = _obj getVariable["claimed","0"]; _ownerID = _obj getVariable["CharacterID","0"]; -_characterID = _ownerID; _ComboMatch = (_ownerID == dayz_combination); -if (DZE_permanentPlot) then { - _combination = _obj getVariable["characterID","0"]; - _ownerID = _obj getVariable["ownerPUID","0"]; - _ComboMatch = (_combination == dayz_combination); -}; +if (DZE_permanentPlot) then {_ownerID = _obj getVariable["ownerPUID","0"];}; if (_alreadyPacking == 1) exitWith {DZE_ActionInProgress = false; format[localize "str_epoch_player_124",_text] call dayz_rollingMessages;}; -// Promt user for password if _ownerID != dayz_playerUID if (_ComboMatch || (_ownerID == dayz_playerUID)) then { - // Check if any players are nearby if not allow player to claim item. _playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 6]) > 1; _playerID = [player] call FNC_GetPlayerUID; @@ -54,88 +47,28 @@ if (_ComboMatch || (_ownerID == dayz_playerUID)) then { // Since item was not claimed proceed with claiming it. _obj setVariable["claimed",_playerID,true]; }; - - _dir = direction _obj; - _vector = [(vectorDir _obj),(vectorUp _obj)]; - _pos = _obj getVariable["OEMPos",getPosATL _obj]; - _objectID = _obj getVariable["ObjectID","0"]; - _objectUID = _obj getVariable["ObjectUID","0"]; _claimedBy = _obj getVariable["claimed","0"]; if (_claimedBy == _playerID) then { - - if(!isNull _obj && alive _obj) then { - - dze_waiting = nil; - PVDZE_log_lockUnlock = [player, _obj, false]; - publicVariableServer "PVDZE_log_lockUnlock"; - //wait for response from server to verify safe was logged before proceeding - waitUntil {!isNil "dze_waiting"}; - + if (!isNull _obj && alive _obj) then { _obj setVariable["packing",1]; ["Working",0,[3,2,8,0]] call dayz_NutritionSystem; - _weapons = _obj getVariable["WeaponCargo",[]]; - _magazines = _obj getVariable["MagazineCargo",[]]; - _backpacks = _obj getVariable["BackpackCargo",[]]; + + disableUserInput true; // Make sure player can not modify gear while it is filling + (findDisplay 106) closeDisplay 0; // Close gear + dze_waiting = nil; + PVDZE_handleSafeGear = [player,_obj,0]; + publicVariableServer "PVDZE_handleSafeGear"; + //wait for response from server to verify safe was logged before proceeding + waitUntil {!isNil "dze_waiting"}; + disableUserInput false; // Safe is done filling now + [_unlockedClass,objNull] spawn fn_waitForObject; + player playActionNow "Medic"; uiSleep 1; [player,"tentpack",0,false] call dayz_zombieSpeak; uiSleep 5; - - _holder = createVehicle [_unlockedClass,_pos,[], 0, "CAN_COLLIDE"]; - // Remove locked vault - deleteVehicle _obj; - _holder setdir _dir; - _holder setVariable["memDir",_dir,true]; - _holder setVectorDirAndUp _vector; - _holder setPosATL _pos; - player reveal _holder; - - _holder setVariable["CharacterID",_characterID,true]; - _holder setVariable["ObjectID",_objectID,true]; - _holder setVariable["ObjectUID",_objectUID,true]; - _holder setVariable ["OEMPos", _pos, true]; - if (DZE_permanentPlot) then { - _holder setVariable ["ownerPUID", _ownerID , true]; - }; - - if (count _weapons > 0) then { - //Add weapons - _objWpnTypes = _weapons select 0; - _objWpnQty = _weapons select 1; - _countr = 0; - { - _holder addweaponcargoGlobal [_x,(_objWpnQty select _countr)]; - _countr = _countr + 1; - } count _objWpnTypes; - }; - - if (count _magazines > 0) then { - //Add Magazines - _objWpnTypes = _magazines select 0; - _objWpnQty = _magazines select 1; - _countr = 0; - { - if (_x != "CSGAS") then - { - _holder addmagazinecargoGlobal [_x,(_objWpnQty select _countr)]; - _countr = _countr + 1; - }; - } count _objWpnTypes; - }; - - if (count _backpacks > 0) then { - //Add Backpacks - _objWpnTypes = _backpacks select 0; - _objWpnQty = _backpacks select 1; - _countr = 0; - { - _holder addbackpackcargoGlobal [_x,(_objWpnQty select _countr)]; - _countr = _countr + 1; - } count _objWpnTypes; - }; - format[localize "STR_BLD_UNLOCKED",_text] call dayz_rollingMessages; }; } else { diff --git a/SQF/dayz_code/init/publicEH.sqf b/SQF/dayz_code/init/publicEH.sqf index 8d684c957..250e22735 100644 --- a/SQF/dayz_code/init/publicEH.sqf +++ b/SQF/dayz_code/init/publicEH.sqf @@ -94,7 +94,7 @@ if (isServer) then { "PVDZE_obj_Trade" addPublicVariableEventHandler {(_this select 1) spawn server_tradeObj}; "PVDZE_plr_TradeMenu" addPublicVariableEventHandler {(_this select 1) spawn server_traders}; "PVDZE_plr_DeathB" addPublicVariableEventHandler {(_this select 1) spawn server_deaths}; - "PVDZE_log_lockUnlock" addPublicVariableEventHandler {(_this select 1) spawn server_logUnlockLockEvent}; + "PVDZE_handleSafeGear" addPublicVariableEventHandler {(_this select 1) spawn server_handleSafeGear}; "PVDZE_fullobj_Publish" addPublicVariableEventHandler {(_this select 1) call server_publishFullObject}; // PlotForLife take base ownership //Added as part of the maintenance system to allow the server to replace the damaged model with a normal model. diff --git a/SQF/dayz_server/compile/server_addCargo.sqf b/SQF/dayz_server/compile/server_addCargo.sqf new file mode 100644 index 000000000..de5c0307c --- /dev/null +++ b/SQF/dayz_server/compile/server_addCargo.sqf @@ -0,0 +1,48 @@ +/* + Adds cargo to an object + + Parameters: + _this select 0: array - weapon cargo to add + _this select 1: array - magazine cargo to add + _this select 2: array - backpack cargo to add + _this select 3: object - object to add cargo to +*/ + +private ["_weapons","_magazines","_backpacks","_holder","_objWpnTypes","_objWpnQty","_counter"]; + +_weapons = _this select 0; +_magazines = _this select 1; +_backpacks = _this select 2; +_holder = _this select 3; + +if (count _weapons > 0) then { + _objWpnTypes = _weapons select 0; + _objWpnQty = _weapons select 1; + _counter = 0; + { + _holder addWeaponCargoGlobal [_x,(_objWpnQty select _counter)]; + _counter = _counter + 1; + } count _objWpnTypes; +}; + +if (count _magazines > 0) then { + _objWpnTypes = _magazines select 0; + _objWpnQty = _magazines select 1; + _counter = 0; + { + if (_x != "CSGAS") then { + _holder addMagazineCargoGlobal [_x,(_objWpnQty select _counter)]; + _counter = _counter + 1; + }; + } count _objWpnTypes; +}; + +if (count _backpacks > 0) then { + _objWpnTypes = _backpacks select 0; + _objWpnQty = _backpacks select 1; + _counter = 0; + { + _holder addBackpackCargoGlobal [_x,(_objWpnQty select _counter)]; + _counter = _counter + 1; + } count _objWpnTypes; +}; \ No newline at end of file diff --git a/SQF/dayz_server/compile/server_handleSafeGear.sqf b/SQF/dayz_server/compile/server_handleSafeGear.sqf new file mode 100644 index 000000000..35e0cd4b0 --- /dev/null +++ b/SQF/dayz_server/compile/server_handleSafeGear.sqf @@ -0,0 +1,106 @@ +private ["_player","_obj","_objectID","_objectUID","_statusText","_puid","_status","_clientID","_type","_lockedClass","_unlockedClass","_packedClass", +"_name","_pos","_dir","_vector","_charID","_ownerID","_weapons","_magazines","_backpacks","_holder"]; + +_player = _this select 0; +_obj = _this select 1; +_status = _this select 2; +_name = if (alive _player) then {name _player} else {"Dead Player"}; + +_type = typeOf _obj; +_pos = _obj getVariable ["OEMPos",getPosATL _obj]; +_dir = direction _obj; +_vector = [vectorDir _obj, vectorUp _obj]; +_charID = _obj getVariable ["CharacterID","0"]; +_objectID = _obj getVariable ["ObjectID","0"]; +_objectUID = _obj getVariable ["ObjectUID","0"]; +_ownerID = _obj getVariable ["ownerPUID","0"]; + +// Player may have disconnected or died before message send. Attempt lock/unlock/pack/save procedure anyway +if (isNull _player) then {diag_log "ERROR: server_handleSafeGear called with Null player object";}; + +_clientID = owner _player; +_puid = [_player] call FNC_GetPlayerUID; + +_statusText = switch (_status) do { + case 0: {"UNLOCKED"}; + case 1: {"LOCKED"}; + case 2: {"PACKED"}; +}; + +if (isNull _obj) exitWith { + diag_log format["ERROR: server_handleSafeGear called with Null safe object by %1(%2). %3 attempt failed.",_name,_puid,_statusText]; + dze_waiting = "fail"; + _clientID publicVariableClient "dze_waiting"; +}; + +switch (_status) do { + case 0: { //Unlocking + _unlockedClass = getText (configFile >> "CfgVehicles" >> _type >> "unlockedClass"); + _weapons = _obj getVariable ["WeaponCargo",[]]; + _magazines = _obj getVariable ["MagazineCargo",[]]; + _backpacks = _obj getVariable ["BackpackCargo",[]]; + + // Create new unlocked safe, then delete old locked safe + _holder = createVehicle [_unlockedClass,_pos,[],0,"CAN_COLLIDE"]; + _holder setDir _dir; + _holder setVariable ["memDir",_dir,true]; + _holder setVectorDirAndUp _vector; + _holder setPosATL _pos; + _holder setVariable ["CharacterID",_charID,true]; + _holder setVariable ["ObjectID",_objectID,true]; + _holder setVariable ["ObjectUID",_objectUID,true]; + _holder setVariable ["OEMPos",_pos,true]; + if (DZE_permanentPlot) then {_holder setVariable ["ownerPUID",_ownerID ,true];}; + deleteVehicle _obj; + + [_weapons,_magazines,_backpacks,_holder] call server_addCargo; + }; + case 1: { //Locking + _lockedClass = getText (configFile >> "CfgVehicles" >> _type >> "lockedClass"); + + // Save old unlocked safe's gear to database + [_obj,"gear"] call server_updateObject; + _weapons = getWeaponCargo _obj; + _magazines = getMagazineCargo _obj; + _backpacks = getBackpackCargo _obj; + + // Create new locked safe, then delete old unlocked safe + _holder = createVehicle [_lockedClass,_pos,[],0,"CAN_COLLIDE"]; + _holder setDir _dir; + _holder setVariable ["memDir",_dir,true]; + _holder setVectorDirAndUp _vector; + _holder setPosATL _pos; + _holder setVariable ["CharacterID",_charID,true]; + _holder setVariable ["ObjectID",_objectID,true]; + _holder setVariable ["ObjectUID",_objectUID,true]; + _holder setVariable ["OEMPos",_pos,true]; + if (DZE_permanentPlot) then {_holder setVariable ["ownerPUID",_ownerID,true];}; + deleteVehicle _obj; + + // Local setVariable gear onto new locked safe for easy access on next unlock + // Do not send big arrays over network! Only server needs these + _holder setVariable ["WeaponCargo",_weapons,false]; + _holder setVariable ["MagazineCargo",_magazines,false]; + _holder setVariable ["BackpackCargo",_backpacks,false]; + }; + case 2: { //Packing + _packedClass = getText (configFile >> "CfgVehicles" >> _type >> "packedClass"); + _weapons = getWeaponCargo _obj; + _magazines = getMagazineCargo _obj; + _backpacks = getBackpackCargo _obj; + + _holder = createVehicle [_packedClass,_pos,[],0,"CAN_COLLIDE"]; + deleteVehicle _obj; + _holder setDir _dir; + _holder setPosATL _pos; + _holder addMagazineCargoGlobal [getText(configFile >> "CfgVehicles" >> _packedClass >> "seedItem"),1]; + [_weapons,_magazines,_backpacks,_holder] call server_addCargo; + + // Delete safe from database + [_objectID,_objectUID,_player] call server_deleteObj; + }; +}; + +diag_log format["%6 %5: ID:%1 CID:%7 UID:%2 BY %3(%4)",_objectID,_objectUID,_name,_puid,_statusText,_type,_charID]; +dze_waiting = "success"; +_clientID publicVariableClient "dze_waiting"; \ No newline at end of file diff --git a/SQF/dayz_server/compile/server_logUnlockLockEvent.sqf b/SQF/dayz_server/compile/server_logUnlockLockEvent.sqf deleted file mode 100644 index 6ab206ce0..000000000 --- a/SQF/dayz_server/compile/server_logUnlockLockEvent.sqf +++ /dev/null @@ -1,26 +0,0 @@ -private ["_player","_obj","_objectID","_objectUID","_statusText","_puid","_status","_clientID","_type"]; - -_player = _this select 0; -_obj = _this select 1; -_status = _this select 2; -_type = typeOf _obj; - -if (isNull _player) then {diag_log "ERROR: server_logUnlockLockEvent called with Null player object";}; -_clientID = owner _player; -_puid = [_player] call FNC_GetPlayerUID; -_statusText = if (_status) then {"LOCKED"} else {"UNLOCKED"}; - -if (!isNull _obj) then { - _objectID = _obj getVariable ["ObjectID","0"]; - _objectUID = _obj getVariable ["ObjectUID","0"]; - - if (_status) then {[_obj,"gear"] call server_updateObject;}; - - diag_log format["%6 %5: ID:%1 UID:%2 BY %3(%4)",_objectID,_objectUID,name _player,_puid,_statusText,_type]; - dze_waiting = "success"; - _clientID publicVariableClient "dze_waiting"; -} else { - diag_log format["ERROR: %4 BY %1(%2) IS NULL AND COULD NOT BE %3 (THIS SHOULD NOT HAPPEN)",name _player,_puid,_statusText,_type]; - dze_waiting = "fail"; - _clientID publicVariableClient "dze_waiting"; -}; \ No newline at end of file diff --git a/SQF/dayz_server/init/server_functions.sqf b/SQF/dayz_server/init/server_functions.sqf index e02c961f2..f4d41de5a 100644 --- a/SQF/dayz_server/init/server_functions.sqf +++ b/SQF/dayz_server/init/server_functions.sqf @@ -31,6 +31,7 @@ spawnComposition = compile preprocessFileLineNumbers "ca\modules\dyno\data\scrip server_sendToClient = compile preprocessFileLineNumbers "\z\addons\dayz_server\eventHandlers\server_sendToClient.sqf"; // EPOCH ADDITIONS +server_addCargo = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_addCargo.sqf"; server_swapObject = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_swapObject.sqf"; //Used to downgrade and upgrade Epoch buildables server_publishVeh = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle.sqf"; //Used to spawn random vehicles by server server_publishVeh2 = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle2.sqf"; //Used to purchase vehicles at traders @@ -41,7 +42,7 @@ server_spawnEvents = compile preprocessFileLineNumbers "\z\addons\dayz_server\co server_deaths = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerDeaths.sqf"; server_maintainArea = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_maintainArea.sqf"; server_checkIfTowed = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_checkIfTowed.sqf"; -server_logUnlockLockEvent = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_logUnlockLockEvent.sqf"; +server_handleSafeGear = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_handleSafeGear.sqf"; spawn_ammosupply = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\spawn_ammosupply.sqf"; spawn_mineveins = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\spawn_mineveins.sqf"; spawn_roadblocks = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\spawn_roadblocks.sqf"; diff --git a/SQF/dayz_server/system/server_monitor.sqf b/SQF/dayz_server/system/server_monitor.sqf index e2ae0449a..36f245564 100644 --- a/SQF/dayz_server/system/server_monitor.sqf +++ b/SQF/dayz_server/system/server_monitor.sqf @@ -238,9 +238,10 @@ _respawnPos = getMarkerpos "respawn_west"; clearBackpackCargoGlobal _object; if( (count _inventory > 0) && !_isPlot && !_doorLocked ) then { if (_type in DZE_LockedStorage) then { - _object setVariable ["WeaponCargo",(_inventory select 0),true]; - _object setVariable ["MagazineCargo",(_inventory select 1),true]; - _object setVariable ["BackpackCargo",(_inventory select 2),true]; + // Do not send big arrays over network! Only server needs these + _object setVariable ["WeaponCargo",(_inventory select 0),false]; + _object setVariable ["MagazineCargo",(_inventory select 1),false]; + _object setVariable ["BackpackCargo",(_inventory select 2),false]; } else { _cargo = _inventory; _config = ["CfgWeapons","CfgMagazines","CfgVehicles"]; diff --git a/Server Files/Battleye/publicvariable.txt b/Server Files/Battleye/publicvariable.txt index 388e08da1..f0cf44fdd 100644 --- a/Server Files/Battleye/publicvariable.txt +++ b/Server Files/Battleye/publicvariable.txt @@ -1,3 +1,3 @@ //new -5 !=(remExField|remExFP) !=(PVCDZ_obj_GutBody|drn_AskServerDynamicWeatherEventArgs|BIS_effects_gepv|achievement|dayzFlies) !=PVDZ_(drg_(RaDrag|RaLW|RLact)|getTickTime|hlt_Bleed|obj_(Delete|Publish|RoadFlare|Destroy|Fire)|veh_Save|veh_SF) !=PVDZ_(plr_(Death|Login[12]|LoginRecord|Save|SwitchMove)|Server(_Simulation|StoreVar)|sec_atp) !=PVDZ_playerMedicalSync !=PVDZ_(send(|Unconscious)) !=PVDZ_Server_LogIt !=PVDZ_Server_process(Code|SetAccessCode) !=PVDZ_objgather_(Delete|Knockdown) !=PVDZE_(obj_(Delete|Publish|Swap|Trade)|fullobj_Publish|maintainArea|veh_(Lock|Publish2|Upgrade)|log_lockUnlock|plr_(DeathB|FriendRQ|GutBodyZ|TradeMenu)) +5 !=(remExField|remExFP) !=(PVCDZ_obj_GutBody|drn_AskServerDynamicWeatherEventArgs|BIS_effects_gepv|achievement|dayzFlies) !=PVDZ_(drg_(RaDrag|RaLW|RLact)|getTickTime|hlt_Bleed|obj_(Delete|Publish|RoadFlare|Destroy|Fire)|veh_Save|veh_SF) !=PVDZ_(plr_(Death|Login[12]|LoginRecord|Save|SwitchMove)|Server(_Simulation|StoreVar)|sec_atp) !=PVDZ_playerMedicalSync !=PVDZ_(send(|Unconscious)) !=PVDZ_Server_LogIt !=PVDZ_Server_process(Code|SetAccessCode) !=PVDZ_objgather_(Delete|Knockdown) !=PVDZE_(obj_(Delete|Publish|Swap|Trade)|fullobj_Publish|maintainArea|veh_(Lock|Publish2|Upgrade)|handleSafeGear|plr_(DeathB|FriendRQ|GutBodyZ|TradeMenu)) 1=BIS_effects_gepv|PVDZ_(drg_RaDrag|hlt_Bleed|obj_Delete|obj_Destroy|obj_Publish|plr_Death|plr_LoginRecord|sec_atp|send|veh_SF) \ No newline at end of file