W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-25 17:31:36 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stop server_publishVehicle3 duping a vehicle if hive fails to update (#1895)

Browse Source 
* Stop server_publishVehicle3 duping a vehicle if hive fails to update

server_publishVehicle3 first creates the vehicle in the database then
reads it back to see if it's successful, previously it wasn't deleting
the vehicle if it failed.

Added a 1 second delay after the vehicle delete to stop duping of
vehicles also.

Fixed references to server_deleteObj that were using 2 parameters
instead of the required 3 and updated the example.

* Rework
This commit is contained in:
oiad
2017-02-14 08:09:21 +13:00
committed by ebayShopper
parent 2ef93e6c57
commit e8dd8fac63
5 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_server/compile/server_deleteObj.sqf
View File

@@ -1,5 +1,5 @@
/*
[_objectID,_objectUID] call server_deleteObj;
[_objectID,_objectUID,_activatingPlayer] call server_deleteObj;
*/
private["_id","_uid","_key","_activatingPlayer"];
_id = _this select 0;
@@ -19,4 +19,4 @@ if (isServer) then {
_key call server_hiveWrite;
diag_log format["DELETE: Player %1 deleted object with UID: %2",_activatingPlayer,_uid];
};
};
};

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

@@ -80,7 +80,10 @@ _key call server_hiveWrite;
};
if (!_done) exitWith {
diag_log("CUSTOM: failed to get id for : " + str(_uid));
diag_log("HIVE-pv3: failed to get id for : " + str(_uid));
_key = format["CHILD:310:%1:",_uid];
_key call server_hiveWrite;
dze_waiting = "fail";
(owner _activatingPlayer) publicVariableClient "dze_waiting";
};
@@ -137,9 +140,7 @@ _key call server_hiveWrite;
} count _objWpnTypes;
_object setVariable ["ObjectID", _oid, true];
_object setVariable ["lastUpdate",time];
_object setVariable ["CharacterID", _characterID, true];
dayz_serverObjectMonitor set [count dayz_serverObjectMonitor,_object];

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

@@ -195,7 +195,7 @@ _object_killed = {
diag_log format["DELETE: Deleted by KEY: %1",_key];
#endif
if (((typeOf _object) in DayZ_removableObjects) or ((typeOf _object) in DZE_isRemovable)) then {[_objectID,_objectUID] call server_deleteObj;};
if (((typeOf _object) in DayZ_removableObjects) or ((typeOf _object) in DZE_isRemovable)) then {[_objectID,_objectUID,"__SERVER__"] call server_deleteObj;};
};
_object_maintenance = {