W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 20:13:13 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove global ObjectID and ObjectUID from server functions

Browse Source 
All ObjectIDs and ObjectUIDs are only visible on the server now no longer on the client.
This commit is contained in:
A Man
2022-03-25 14:29:00 +01:00
parent 2168d504bb
commit d4e6e786d2
17 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_code/actions/player_destroyTent.sqf
View File

@@ -1,12 +1,10 @@
if (dayz_actionInProgress) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; }; if (dayz_actionInProgress) exitWith { localize "str_player_actionslimit" call dayz_rollingMessages; };
dayz_actionInProgress = true; dayz_actionInProgress = true;
private ["_emptycan","_objectID","_objectUID","_obj","_fuelArray","_matchArray","_randomJerryCan","_fireIntensity","_finished"]; private ["_emptycan","_obj","_fuelArray","_matchArray","_randomJerryCan","_fireIntensity","_finished"];
//Tent Object //Tent Object
_obj = _this select 3; _obj = _this select 3;
_objectID = _obj getVariable["ObjectID","0"];
_objectUID = _obj getVariable["ObjectUID","0"];
//Active Arrays. //Active Arrays.
_fuelArray = []; _fuelArray = [];

2
SQF/dayz_code/compile/player_packTent.sqf
View File

@@ -15,8 +15,6 @@ dayz_actionInProgress = true;
local _obj = _this; local _obj = _this;
local _objType = typeOf _obj; local _objType = typeOf _obj;
local _objectID = _obj getVariable["ObjectID","0"];
local _objectUID = _obj getVariable["ObjectUID","0"];
local _ownerID = _obj getVariable["ownerPUID","0"]; local _ownerID = _obj getVariable["ownerPUID","0"];
local _playerNear = {isPlayer _x} count (([_obj] call FNC_GetPos) nearEntities ["CAManBase", 12]) > 1; local _playerNear = {isPlayer _x} count (([_obj] call FNC_GetPos) nearEntities ["CAManBase", 12]) > 1;

2
SQF/dayz_server/compile/garage/server_spawnVehicle.sqf
View File

@@ -63,7 +63,7 @@ if (_outcome != "PASS") then {
[_inventory select 0,_inventory select 1,_inventory select 2,_object] call fn_addCargo; [_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 ["lastUpdate",diag_tickTime];
_object setVariable ["VGObjectID",_VG_ObjID, false]; _object setVariable ["VGObjectID",_VG_ObjID, false];

2
SQF/dayz_server/compile/server_changeCode.sqf
View File

@@ -59,7 +59,7 @@ _holder setVariable ["ownerPUID",_ownerPUID,true];
if (_isZSC) then {_holder setVariable ["cashMoney",_coins,true];}; if (_isZSC) then {_holder setVariable ["cashMoney",_coins,true];};
_objectUID = _worldSpace call dayz_objectUID2; _objectUID = _worldSpace call dayz_objectUID2;
_holder setVariable ["ObjectUID",_objectUID,true]; _holder setVariable ["ObjectUID",_objectUID];
deleteVehicle _object; deleteVehicle _object;

8
SQF/dayz_server/compile/server_handleSafeGear.sqf
View File

@@ -70,8 +70,8 @@ call {
_holder setVectorDirAndUp _vector; _holder setVectorDirAndUp _vector;
_holder setPosATL _pos; _holder setPosATL _pos;
_holder setVariable ["CharacterID",_charID,true]; _holder setVariable ["CharacterID",_charID,true];
_holder setVariable ["ObjectID",_objectID,true]; _holder setVariable ["ObjectID",_objectID];
_holder setVariable ["ObjectUID",_objectUID,true]; _holder setVariable ["ObjectUID",_objectUID];
_holder setVariable ["OEMPos",_pos,true]; _holder setVariable ["OEMPos",_pos,true];
_holder setDamage _damage; _holder setDamage _damage;
_holder setVariable ["ownerPUID",_ownerID,true]; _holder setVariable ["ownerPUID",_ownerID,true];
@@ -98,8 +98,8 @@ call {
_holder setVectorDirAndUp _vector; _holder setVectorDirAndUp _vector;
_holder setPosATL _pos; _holder setPosATL _pos;
_holder setVariable ["CharacterID",_charID,true]; _holder setVariable ["CharacterID",_charID,true];
_holder setVariable ["ObjectID",_objectID,true]; _holder setVariable ["ObjectID",_objectID];
_holder setVariable ["ObjectUID",_objectUID,true]; _holder setVariable ["ObjectUID",_objectUID];
_holder setVariable ["OEMPos",_pos,true]; _holder setVariable ["OEMPos",_pos,true];
_holder setDamage _damage; _holder setDamage _damage;
_holder setVariable ["ownerPUID",_ownerID,true]; _holder setVariable ["ownerPUID",_ownerID,true];

2
SQF/dayz_server/compile/server_publishVehicle.sqf
View File

@@ -63,7 +63,7 @@ if (_outcome != "PASS") then {
diag_log("CUSTOM: failed to get id for : " + str(_uid)); diag_log("CUSTOM: failed to get id for : " + str(_uid));
} else { } else {
_oid = _result select 1; _oid = _result select 1;
_object setVariable ["ObjectID", _oid, true]; _object setVariable ["ObjectID", _oid];
#ifdef OBJECT_DEBUG #ifdef OBJECT_DEBUG
diag_log("CUSTOM: Selected " + str(_oid)); diag_log("CUSTOM: Selected " + str(_oid));

2
SQF/dayz_server/compile/server_publishVehicle2.sqf
View File

@@ -78,7 +78,7 @@ if (_outcome != "PASS") then {
clearWeaponCargoGlobal _object; clearWeaponCargoGlobal _object;
clearMagazineCargoGlobal _object; clearMagazineCargoGlobal _object;
dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object]; dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object];
_object setVariable ["ObjectID", _oid, true]; _object setVariable ["ObjectID", _oid];
_object setVariable ["lastUpdate",diag_tickTime]; _object setVariable ["lastUpdate",diag_tickTime];
_object setVariable ["CharacterID", _characterID, true]; _object setVariable ["CharacterID", _characterID, true];

2
SQF/dayz_server/compile/server_publishVehicle3.sqf
View File

@@ -103,7 +103,7 @@ if (_outcome != "PASS") then {
// switch var to new vehicle at this point. // switch var to new vehicle at this point.
_object = _newobject; _object = _newobject;
_object setVariable ["ObjectID", _oid, true]; _object setVariable ["ObjectID", _oid];
_object setVariable ["lastUpdate",diag_tickTime]; _object setVariable ["lastUpdate",diag_tickTime];
_object setVariable ["CharacterID", _characterID, true]; _object setVariable ["CharacterID", _characterID, true];

2
SQF/dayz_server/compile/server_publishVehicle3_vkc.sqf
View File

@@ -119,7 +119,7 @@ if (_outcome != "PASS") then {
// switch var to new vehicle at this point. // switch var to new vehicle at this point.
_object = _newobject; _object = _newobject;
_object setVariable ["ObjectID", _oid, true]; _object setVariable ["ObjectID", _oid];
_object setVariable ["lastUpdate",diag_tickTime]; _object setVariable ["lastUpdate",diag_tickTime];
_object setVariable ["CharacterID", _characterID, true]; _object setVariable ["CharacterID", _characterID, true];

5
SQF/dayz_server/compile/server_swapObject.sqf
View File

@@ -69,7 +69,6 @@ if (!_allowed || !_proceed) exitWith {
// Publish variables // Publish variables
_object setVariable ["CharacterID",_charID,true]; _object setVariable ["CharacterID",_charID,true];
//_object setVariable ["ObjectUID",_objectUID,true];
_object setVariable ["OEMPos",(_worldspace select 1),true]; _object setVariable ["OEMPos",(_worldspace select 1),true];
//diag_log ("PUBLISH: Attempt " + str(_object)); //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; _key call server_hiveWrite;
_object setVariable ["lastUpdate",diag_tickTime]; _object setVariable ["lastUpdate",diag_tickTime];
_object setVariable ["ObjectUID", _uid,true]; _object setVariable ["ObjectUID", _uid];
// _object setVariable ["CharacterID",_charID,true];
if (DZE_GodModeBase && {!(_class in DZE_GodModeBaseExclude)}) then { if (DZE_GodModeBase && {!(_class in DZE_GodModeBaseExclude)}) then {
_object addEventHandler ["HandleDamage",{false}]; _object addEventHandler ["HandleDamage",{false}];
} else { } else {

1
SQF/dayz_server/compile/spawn_ammosupply.sqf
View File

@@ -20,5 +20,4 @@ if ((count _position) == 2) then {
_veh enableSimulation false; _veh enableSimulation false;
_veh setDir round(random 360); _veh setDir round(random 360);
_veh setPos _position; _veh setPos _position;
_veh setVariable ["ObjectID","1",true];
}; };

2
SQF/dayz_server/compile/spawn_mineveins.sqf
View File

@@ -15,7 +15,7 @@ if ((count _position) == 2) then {
_veh enableSimulation false; _veh enableSimulation false;
_veh setDir round(random 360); _veh setDir round(random 360);
_veh setPos _position; _veh setPos _position;
_veh setVariable ["ObjectID","1",true];
_veh addEventHandler ["HandleDamage",{ _veh addEventHandler ["HandleDamage",{
local _damage = _this select 2; local _damage = _this select 2;
if ((_this select 4) == "Sledge_Swing_Ammo") then { if ((_this select 4) == "Sledge_Swing_Ammo") then {

1
SQF/dayz_server/compile/spawn_roadblocks.sqf
View File

@@ -15,5 +15,4 @@ if ((count _position) == 2) then {
_veh enableSimulation false; _veh enableSimulation false;
_veh setDir round(random 360); _veh setDir round(random 360);
_veh setPos _position; _veh setPos _position;
_veh setVariable ["ObjectID","1",true];
}; };

1
SQF/dayz_server/compile/updateObject_functions.sqf
View File

@@ -37,7 +37,6 @@ server_obj_inv = {
[getWeaponCargo _object, getMagazineCargo _object, getBackpackCargo _object] [getWeaponCargo _object, getMagazineCargo _object, getBackpackCargo _object]
}; };
local _previous = str(_object getVariable["lastInventory",[]]); local _previous = str(_object getVariable["lastInventory",[]]);
if (str _inventory != _previous) then { if (str _inventory != _previous) then {
local _key = ""; local _key = "";

2
SQF/dayz_server/modules/Care_Packages.sqf
View File

@@ -42,8 +42,6 @@ for "_i" from 1 to (SPAWN_NUM) do
//_vehicle = createVehicle [_class, _position, [], 0, "CAN_COLLIDE"]; //_vehicle = createVehicle [_class, _position, [], 0, "CAN_COLLIDE"];
_vehicle = _class createVehicle _position; _vehicle = _class createVehicle _position;
dayz_serverObjectMonitor set [count dayz_serverObjectMonitor, _vehicle]; dayz_serverObjectMonitor set [count dayz_serverObjectMonitor, _vehicle];
_vehicle setVariable ["ObjectID", 1, true];
_size = sizeOf _class; _size = sizeOf _class;
{ {

1
SQF/dayz_server/modules/CrashSites.sqf
View File

@@ -46,7 +46,6 @@ _spawnCrashSite =
_vehicle = "ClutterCutter_small_2_EP1" createVehicle _position; _vehicle = "ClutterCutter_small_2_EP1" createVehicle _position;
_vehicle = _class createVehicle [0,0,0]; _vehicle = _class createVehicle [0,0,0];
_vehicle setVariable ["ObjectID", 1, true];
_vehicle setDir random 360; _vehicle setDir random 360;
_vehicle setPos _position; _vehicle setPos _position;

4
SQF/dayz_server/system/server_monitor.sqf
View File

@@ -199,7 +199,7 @@ if ((playersNumber west + playersNumber civilian) == 0) exitWith {
// prevent immediate hive write when vehicle parts are set up // prevent immediate hive write when vehicle parts are set up
_object setVariable ["lastUpdate",diag_ticktime]; _object setVariable ["lastUpdate",diag_ticktime];
_object setVariable ["ObjectID", _idKey, true]; _object setVariable ["ObjectID", _idKey];
_object setVariable ["OwnerPUID", _ownerPUID, true]; _object setVariable ["OwnerPUID", _ownerPUID, true];
if (Z_SingleCurrency && {_type in DZE_MoneyStorageClasses}) then { if (Z_SingleCurrency && {_type in DZE_MoneyStorageClasses}) then {
_object setVariable ["cashMoney", _storageMoney, true]; _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 // prevent immediate hive write when vehicle parts are set up
_object setVariable ["lastUpdate",diag_ticktime]; _object setVariable ["lastUpdate",diag_ticktime];
_object setVariable ["ObjectID", _idKey, true]; _object setVariable ["ObjectID", _idKey];
if (Z_SingleCurrency && {ZSC_VehicleMoneyStorage}) then { if (Z_SingleCurrency && {ZSC_VehicleMoneyStorage}) then {
_object setVariable ["cashMoney", _storageMoney, true]; _object setVariable ["cashMoney", _storageMoney, true];
}; };