From 3e0ddef7b127e1bd2abfea175f22a6432cdb4cb1 Mon Sep 17 00:00:00 2001 From: oiad Date: Sun, 21 Jan 2018 12:48:52 +1300 Subject: [PATCH] Fix more dayz_serverKey from https://github.com/EpochModTeam/DayZ-Epoch/commit/b5f3f306de9e989a1106333e6feeb97f2e73a3d0 Thanks to @AirwavesMan for the heads up Hopefully no more! :) --- SQF/dayz_server/compile/server_updateObject.sqf | 6 +++--- SQF/dayz_server/init/server_functions.sqf | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/SQF/dayz_server/compile/server_updateObject.sqf b/SQF/dayz_server/compile/server_updateObject.sqf index 1032b35b7..02340966f 100644 --- a/SQF/dayz_server/compile/server_updateObject.sqf +++ b/SQF/dayz_server/compile/server_updateObject.sqf @@ -188,11 +188,11 @@ _object_killed = { _exitReason = switch true do { //Can't use owner because player may already be dead, can't use distance because player may be far from vehicle wreck - case (_clientKey == dayz_serverKey): {""}; + case ([_clientKey,dayz_serverKey] call BIS_fnc_areEqual): {""}; case (_index < 0): { format["Server_UpdateObject error: PUID NOT FOUND ON SERVER. PV ARRAY: %1",_this] }; - case ((dayz_serverClientKeys select _index) select 1 != _clientKey): { + case !([((dayz_serverClientKeys select _index) select 1),_clientKey] call BIS_fnc_areEqual): { format["Server_UpdateObject error: CLIENT AUTH KEY INCORRECT OR UNRECOGNIZED. PV ARRAY: %1",_this] }; case (alive _object && {!(_class isKindOf "TentStorage_base" or _class isKindOf "IC_Tent")}): { @@ -200,7 +200,7 @@ _object_killed = { }; default {""}; }; - + if (_exitReason != "") exitWith {diag_log _exitReason}; _object setDamage 1; diff --git a/SQF/dayz_server/init/server_functions.sqf b/SQF/dayz_server/init/server_functions.sqf index 30784bbec..39f7356e0 100644 --- a/SQF/dayz_server/init/server_functions.sqf +++ b/SQF/dayz_server/init/server_functions.sqf @@ -17,7 +17,6 @@ dayz_serverKey = []; for "_i" from 0 to 12 do { dayz_serverKey set [_i, ceil(random 128)]; }; -dayz_serverKey = toString dayz_serverKey; server_playerLogin = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerLogin.sqf"; server_playerSetup = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerSetup.sqf"; server_onPlayerDisconnect = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_onPlayerDisconnect.sqf";