diff --git a/SQF/dayz_server/compile/server_sendToClient.sqf b/SQF/dayz_server/compile/server_sendToClient.sqf index d6f9951e6..57ad96677 100644 --- a/SQF/dayz_server/compile/server_sendToClient.sqf +++ b/SQF/dayz_server/compile/server_sendToClient.sqf @@ -1,11 +1,13 @@ private ["_unit","_variable","_arraytosend","_owner","_vehicle","_qty"]; //Inbound [_unit,"PVCDZ_hlt_Transfuse",[_unit,player,1000]] _unit = _this select 0; + +if(isNull _unit) exitWith {diag_log format ["ERROR: sendToClient is Null: %1", _unit]}; + _variable = _this select 1; _arraytosend = _this select 2; _owner = owner _unit; - //diag_log format ["%1, %2, %3, %4", _unit, _variable, _arraytosend, _owner]; //execution diff --git a/SQF/dayz_server/init/server_functions.sqf b/SQF/dayz_server/init/server_functions.sqf index e242e273b..c6afa2e3b 100644 --- a/SQF/dayz_server/init/server_functions.sqf +++ b/SQF/dayz_server/init/server_functions.sqf @@ -889,6 +889,8 @@ server_getLocalObjVars = { _player = _this select 0; _obj = _this select 1; + if (isNull _player or isNull _obj) exitWith { diag_log format["ERROR: getLocalObjVars is Null Player: %1 Object: %2 ", _player, _obj] }; + _objectID = _obj getVariable["ObjectID","0"]; _objectUID = _obj getVariable["ObjectUID","0"]; @@ -898,7 +900,6 @@ server_getLocalObjVars = { PVDZE_localVarsResult = [_weapons,_magazines,_backpacks]; (owner _player) publicVariableClient "PVDZE_localVarsResult"; - diag_log format["SAFE UNLOCKED: ID:%1 UID:%2 BY %3(%4)", _objectID, _objectUID, (name _player), (getPlayerUID _player)]; }; @@ -909,6 +910,8 @@ server_setLocalObjVars = { _holder = _this select 1; _player = _this select 2; + if (isNull _player or isNull _holder or isNull _obj) exitWith { diag_log format["ERROR: setLocalObjVars is Null Player: %1 Object: %2 Holder: %3", _player, _obj, _holder] }; + _objectID = _obj getVariable["ObjectID","0"]; _objectUID = _obj getVariable["ObjectUID","0"];