diff --git a/SQF/dayz_code/compile/player_packTent.sqf b/SQF/dayz_code/compile/player_packTent.sqf index bfe6b7e4b..eba05a9e9 100644 --- a/SQF/dayz_code/compile/player_packTent.sqf +++ b/SQF/dayz_code/compile/player_packTent.sqf @@ -4,7 +4,7 @@ if (dayz_actionInProgress) exitWith {localize "str_player_beingpacked" call dayz_rollingMessages;}; dayz_actionInProgress = true; -private ["_activatingPlayer","_alreadyPacking","_backpacks","_bag","_campItems","_countr","_dir","_holder","_magazines","_obj","_objWpnQty","_objWpnTypes","_objectID","_objectUID","_ownerID","_packobj","_playerNear","_pos","_weapons"]; +private ["_alreadyPacking","_backpacks","_bag","_campItems","_countr","_dir","_holder","_magazines","_obj","_objWpnQty","_objWpnTypes","_objectID","_objectUID","_ownerID","_packobj","_playerNear","_pos","_weapons"]; _obj = _this; _ownerID = _obj getVariable["CharacterID","0"]; @@ -18,7 +18,6 @@ _playerNear = _obj call dze_isnearest_player; if (_playerNear) exitWith {dayz_actionInProgress = false; localize "str_epoch_player_16" call dayz_rollingMessages;}; _packobj = getText (configFile >> "CfgVehicles" >> typeOf _obj >> "pack"); -_activatingPlayer = player; player removeAction s_player_packtent; s_player_packtent = -1; @@ -51,10 +50,8 @@ if (_ownerID in [dayz_characterID,dayz_playerUID] or typeOf _obj in _campItems) _magazines = getMagazineCargo _obj; _backpacks = getBackpackCargo _obj; - PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer]; + PVDZ_obj_Destroy = [_objectID,_objectUID,player]; publicVariableServer "PVDZ_obj_Destroy"; - - if (isServer) then {PVDZ_obj_Destroy call server_deleteObj;}; deleteVehicle _obj; //Add weapons diff --git a/SQF/dayz_code/system/player_spawn_2.sqf b/SQF/dayz_code/system/player_spawn_2.sqf index 8d2e8a3a8..7fca646e3 100644 --- a/SQF/dayz_code/system/player_spawn_2.sqf +++ b/SQF/dayz_code/system/player_spawn_2.sqf @@ -8,15 +8,8 @@ _radTimer = 0; _timer = diag_tickTime; _timer1 = diag_tickTime; -_spawnCheck = diag_tickTime; -_timer2 = diag_Ticktime; -_timer5 = diag_Ticktime; -_timer10 = diag_Ticktime; _timer30 = diag_Ticktime; _timer150 = diag_ticktime; - -_forceHumanity = false; -_runonce = false; _timerMonitor = diag_ticktime; player setVariable ["temperature",dayz_temperatur,true];