From d4e6e786d25cdeb3269892b0e711cd603611be3c Mon Sep 17 00:00:00 2001 From: A Man Date: Fri, 25 Mar 2022 14:29:00 +0100 Subject: [PATCH] Remove global ObjectID and ObjectUID from server functions All ObjectIDs and ObjectUIDs are only visible on the server now no longer on the client. --- SQF/dayz_code/actions/player_destroyTent.sqf | 4 +--- SQF/dayz_code/compile/player_packTent.sqf | 2 -- SQF/dayz_server/compile/garage/server_spawnVehicle.sqf | 2 +- SQF/dayz_server/compile/server_changeCode.sqf | 2 +- SQF/dayz_server/compile/server_handleSafeGear.sqf | 8 ++++---- SQF/dayz_server/compile/server_publishVehicle.sqf | 2 +- SQF/dayz_server/compile/server_publishVehicle2.sqf | 2 +- SQF/dayz_server/compile/server_publishVehicle3.sqf | 2 +- SQF/dayz_server/compile/server_publishVehicle3_vkc.sqf | 2 +- SQF/dayz_server/compile/server_swapObject.sqf | 5 ++--- SQF/dayz_server/compile/spawn_ammosupply.sqf | 1 - SQF/dayz_server/compile/spawn_mineveins.sqf | 2 +- SQF/dayz_server/compile/spawn_roadblocks.sqf | 1 - SQF/dayz_server/compile/updateObject_functions.sqf | 1 - SQF/dayz_server/modules/Care_Packages.sqf | 4 +--- SQF/dayz_server/modules/CrashSites.sqf | 1 - SQF/dayz_server/system/server_monitor.sqf | 4 ++-- 17 files changed, 17 insertions(+), 28 deletions(-) diff --git a/SQF/dayz_code/actions/player_destroyTent.sqf b/SQF/dayz_code/actions/player_destroyTent.sqf index a84f13885..a5863c51a 100644 --- a/SQF/dayz_code/actions/player_destroyTent.sqf +++ b/SQF/dayz_code/actions/player_destroyTent.sqf @@ -1,12 +1,10 @@ if (dayz_actionInProgress) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; }; dayz_actionInProgress = true; -private ["_emptycan","_objectID","_objectUID","_obj","_fuelArray","_matchArray","_randomJerryCan","_fireIntensity","_finished"]; +private ["_emptycan","_obj","_fuelArray","_matchArray","_randomJerryCan","_fireIntensity","_finished"]; //Tent Object _obj = _this select 3; -_objectID = _obj getVariable["ObjectID","0"]; -_objectUID = _obj getVariable["ObjectUID","0"]; //Active Arrays. _fuelArray = []; diff --git a/SQF/dayz_code/compile/player_packTent.sqf b/SQF/dayz_code/compile/player_packTent.sqf index 270e60af8..ad671669a 100644 --- a/SQF/dayz_code/compile/player_packTent.sqf +++ b/SQF/dayz_code/compile/player_packTent.sqf @@ -15,8 +15,6 @@ dayz_actionInProgress = true; local _obj = _this; local _objType = typeOf _obj; -local _objectID = _obj getVariable["ObjectID","0"]; -local _objectUID = _obj getVariable["ObjectUID","0"]; local _ownerID = _obj getVariable["ownerPUID","0"]; local _playerNear = {isPlayer _x} count (([_obj] call FNC_GetPos) nearEntities ["CAManBase", 12]) > 1; diff --git a/SQF/dayz_server/compile/garage/server_spawnVehicle.sqf b/SQF/dayz_server/compile/garage/server_spawnVehicle.sqf index b9b35830e..f951599ea 100644 --- a/SQF/dayz_server/compile/garage/server_spawnVehicle.sqf +++ b/SQF/dayz_server/compile/garage/server_spawnVehicle.sqf @@ -63,7 +63,7 @@ if (_outcome != "PASS") then { [_inventory select 0,_inventory select 1,_inventory select 2,_object] call fn_addCargo; - _object setVariable ["ObjectID", _oid, true]; + _object setVariable ["ObjectID", _oid]; _object setVariable ["lastUpdate",diag_tickTime]; _object setVariable ["VGObjectID",_VG_ObjID, false]; diff --git a/SQF/dayz_server/compile/server_changeCode.sqf b/SQF/dayz_server/compile/server_changeCode.sqf index 067eac5b9..62488129d 100644 --- a/SQF/dayz_server/compile/server_changeCode.sqf +++ b/SQF/dayz_server/compile/server_changeCode.sqf @@ -59,7 +59,7 @@ _holder setVariable ["ownerPUID",_ownerPUID,true]; if (_isZSC) then {_holder setVariable ["cashMoney",_coins,true];}; _objectUID = _worldSpace call dayz_objectUID2; -_holder setVariable ["ObjectUID",_objectUID,true]; +_holder setVariable ["ObjectUID",_objectUID]; deleteVehicle _object; diff --git a/SQF/dayz_server/compile/server_handleSafeGear.sqf b/SQF/dayz_server/compile/server_handleSafeGear.sqf index db9e70c9f..fc5e3c6f1 100644 --- a/SQF/dayz_server/compile/server_handleSafeGear.sqf +++ b/SQF/dayz_server/compile/server_handleSafeGear.sqf @@ -70,8 +70,8 @@ call { _holder setVectorDirAndUp _vector; _holder setPosATL _pos; _holder setVariable ["CharacterID",_charID,true]; - _holder setVariable ["ObjectID",_objectID,true]; - _holder setVariable ["ObjectUID",_objectUID,true]; + _holder setVariable ["ObjectID",_objectID]; + _holder setVariable ["ObjectUID",_objectUID]; _holder setVariable ["OEMPos",_pos,true]; _holder setDamage _damage; _holder setVariable ["ownerPUID",_ownerID,true]; @@ -98,8 +98,8 @@ call { _holder setVectorDirAndUp _vector; _holder setPosATL _pos; _holder setVariable ["CharacterID",_charID,true]; - _holder setVariable ["ObjectID",_objectID,true]; - _holder setVariable ["ObjectUID",_objectUID,true]; + _holder setVariable ["ObjectID",_objectID]; + _holder setVariable ["ObjectUID",_objectUID]; _holder setVariable ["OEMPos",_pos,true]; _holder setDamage _damage; _holder setVariable ["ownerPUID",_ownerID,true]; diff --git a/SQF/dayz_server/compile/server_publishVehicle.sqf b/SQF/dayz_server/compile/server_publishVehicle.sqf index d4eb4c3d5..deea62e12 100644 --- a/SQF/dayz_server/compile/server_publishVehicle.sqf +++ b/SQF/dayz_server/compile/server_publishVehicle.sqf @@ -63,7 +63,7 @@ if (_outcome != "PASS") then { diag_log("CUSTOM: failed to get id for : " + str(_uid)); } else { _oid = _result select 1; - _object setVariable ["ObjectID", _oid, true]; + _object setVariable ["ObjectID", _oid]; #ifdef OBJECT_DEBUG diag_log("CUSTOM: Selected " + str(_oid)); diff --git a/SQF/dayz_server/compile/server_publishVehicle2.sqf b/SQF/dayz_server/compile/server_publishVehicle2.sqf index 523e9ee38..4468f48b3 100644 --- a/SQF/dayz_server/compile/server_publishVehicle2.sqf +++ b/SQF/dayz_server/compile/server_publishVehicle2.sqf @@ -78,7 +78,7 @@ if (_outcome != "PASS") then { clearWeaponCargoGlobal _object; clearMagazineCargoGlobal _object; dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object]; - _object setVariable ["ObjectID", _oid, true]; + _object setVariable ["ObjectID", _oid]; _object setVariable ["lastUpdate",diag_tickTime]; _object setVariable ["CharacterID", _characterID, true]; diff --git a/SQF/dayz_server/compile/server_publishVehicle3.sqf b/SQF/dayz_server/compile/server_publishVehicle3.sqf index 2eec577cc..d9575b638 100644 --- a/SQF/dayz_server/compile/server_publishVehicle3.sqf +++ b/SQF/dayz_server/compile/server_publishVehicle3.sqf @@ -103,7 +103,7 @@ if (_outcome != "PASS") then { // switch var to new vehicle at this point. _object = _newobject; - _object setVariable ["ObjectID", _oid, true]; + _object setVariable ["ObjectID", _oid]; _object setVariable ["lastUpdate",diag_tickTime]; _object setVariable ["CharacterID", _characterID, true]; diff --git a/SQF/dayz_server/compile/server_publishVehicle3_vkc.sqf b/SQF/dayz_server/compile/server_publishVehicle3_vkc.sqf index dc2347feb..982990595 100644 --- a/SQF/dayz_server/compile/server_publishVehicle3_vkc.sqf +++ b/SQF/dayz_server/compile/server_publishVehicle3_vkc.sqf @@ -119,7 +119,7 @@ if (_outcome != "PASS") then { // switch var to new vehicle at this point. _object = _newobject; - _object setVariable ["ObjectID", _oid, true]; + _object setVariable ["ObjectID", _oid]; _object setVariable ["lastUpdate",diag_tickTime]; _object setVariable ["CharacterID", _characterID, true]; diff --git a/SQF/dayz_server/compile/server_swapObject.sqf b/SQF/dayz_server/compile/server_swapObject.sqf index 96082512f..993c57c57 100644 --- a/SQF/dayz_server/compile/server_swapObject.sqf +++ b/SQF/dayz_server/compile/server_swapObject.sqf @@ -69,7 +69,6 @@ if (!_allowed || !_proceed) exitWith { // Publish variables _object setVariable ["CharacterID",_charID,true]; -//_object setVariable ["ObjectUID",_objectUID,true]; _object setVariable ["OEMPos",(_worldspace select 1),true]; //diag_log ("PUBLISH: Attempt " + str(_object)); @@ -84,8 +83,8 @@ _key = str formatText["CHILD:308:%1:%2:%3:%4:%5:%6:%7:%8:%9:",dayZ_instance, _cl _key call server_hiveWrite; _object setVariable ["lastUpdate",diag_tickTime]; -_object setVariable ["ObjectUID", _uid,true]; -// _object setVariable ["CharacterID",_charID,true]; +_object setVariable ["ObjectUID", _uid]; + if (DZE_GodModeBase && {!(_class in DZE_GodModeBaseExclude)}) then { _object addEventHandler ["HandleDamage",{false}]; } else { diff --git a/SQF/dayz_server/compile/spawn_ammosupply.sqf b/SQF/dayz_server/compile/spawn_ammosupply.sqf index 5e77a4def..4910cf715 100644 --- a/SQF/dayz_server/compile/spawn_ammosupply.sqf +++ b/SQF/dayz_server/compile/spawn_ammosupply.sqf @@ -20,5 +20,4 @@ if ((count _position) == 2) then { _veh enableSimulation false; _veh setDir round(random 360); _veh setPos _position; - _veh setVariable ["ObjectID","1",true]; }; \ No newline at end of file diff --git a/SQF/dayz_server/compile/spawn_mineveins.sqf b/SQF/dayz_server/compile/spawn_mineveins.sqf index 5329dfcb4..1ea9a0672 100644 --- a/SQF/dayz_server/compile/spawn_mineveins.sqf +++ b/SQF/dayz_server/compile/spawn_mineveins.sqf @@ -15,7 +15,7 @@ if ((count _position) == 2) then { _veh enableSimulation false; _veh setDir round(random 360); _veh setPos _position; - _veh setVariable ["ObjectID","1",true]; + _veh addEventHandler ["HandleDamage",{ local _damage = _this select 2; if ((_this select 4) == "Sledge_Swing_Ammo") then { diff --git a/SQF/dayz_server/compile/spawn_roadblocks.sqf b/SQF/dayz_server/compile/spawn_roadblocks.sqf index 1530415ac..d9e02916b 100644 --- a/SQF/dayz_server/compile/spawn_roadblocks.sqf +++ b/SQF/dayz_server/compile/spawn_roadblocks.sqf @@ -15,5 +15,4 @@ if ((count _position) == 2) then { _veh enableSimulation false; _veh setDir round(random 360); _veh setPos _position; - _veh setVariable ["ObjectID","1",true]; }; \ No newline at end of file diff --git a/SQF/dayz_server/compile/updateObject_functions.sqf b/SQF/dayz_server/compile/updateObject_functions.sqf index 166f3c32a..2245c9007 100644 --- a/SQF/dayz_server/compile/updateObject_functions.sqf +++ b/SQF/dayz_server/compile/updateObject_functions.sqf @@ -37,7 +37,6 @@ server_obj_inv = { [getWeaponCargo _object, getMagazineCargo _object, getBackpackCargo _object] }; - local _previous = str(_object getVariable["lastInventory",[]]); if (str _inventory != _previous) then { local _key = ""; diff --git a/SQF/dayz_server/modules/Care_Packages.sqf b/SQF/dayz_server/modules/Care_Packages.sqf index 1a9cadd24..5597648cb 100644 --- a/SQF/dayz_server/modules/Care_Packages.sqf +++ b/SQF/dayz_server/modules/Care_Packages.sqf @@ -41,9 +41,7 @@ for "_i" from 1 to (SPAWN_NUM) do //_vehicle = createVehicle [_class, _position, [], 0, "CAN_COLLIDE"]; _vehicle = _class createVehicle _position; - dayz_serverObjectMonitor set [count dayz_serverObjectMonitor, _vehicle]; - _vehicle setVariable ["ObjectID", 1, true]; - + dayz_serverObjectMonitor set [count dayz_serverObjectMonitor, _vehicle]; _size = sizeOf _class; { diff --git a/SQF/dayz_server/modules/CrashSites.sqf b/SQF/dayz_server/modules/CrashSites.sqf index 3b738c196..1dad5a88f 100644 --- a/SQF/dayz_server/modules/CrashSites.sqf +++ b/SQF/dayz_server/modules/CrashSites.sqf @@ -46,7 +46,6 @@ _spawnCrashSite = _vehicle = "ClutterCutter_small_2_EP1" createVehicle _position; _vehicle = _class createVehicle [0,0,0]; - _vehicle setVariable ["ObjectID", 1, true]; _vehicle setDir random 360; _vehicle setPos _position; diff --git a/SQF/dayz_server/system/server_monitor.sqf b/SQF/dayz_server/system/server_monitor.sqf index dce35ae88..44b71b6c0 100644 --- a/SQF/dayz_server/system/server_monitor.sqf +++ b/SQF/dayz_server/system/server_monitor.sqf @@ -199,7 +199,7 @@ if ((playersNumber west + playersNumber civilian) == 0) exitWith { // prevent immediate hive write when vehicle parts are set up _object setVariable ["lastUpdate",diag_ticktime]; - _object setVariable ["ObjectID", _idKey, true]; + _object setVariable ["ObjectID", _idKey]; _object setVariable ["OwnerPUID", _ownerPUID, true]; if (Z_SingleCurrency && {_type in DZE_MoneyStorageClasses}) then { _object setVariable ["cashMoney", _storageMoney, true]; @@ -340,7 +340,7 @@ if ((playersNumber west + playersNumber civilian) == 0) exitWith { // prevent immediate hive write when vehicle parts are set up _object setVariable ["lastUpdate",diag_ticktime]; - _object setVariable ["ObjectID", _idKey, true]; + _object setVariable ["ObjectID", _idKey]; if (Z_SingleCurrency && {ZSC_VehicleMoneyStorage}) then { _object setVariable ["cashMoney", _storageMoney, true]; };