diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt index 593d9af99..ed731de90 100644 --- a/CHANGE LOG 1.0.6.txt +++ b/CHANGE LOG 1.0.6.txt @@ -43,6 +43,7 @@ [NEW] Fuel stations now have limited amount of fuel each restart. Configurable with dayz_randomMaxFuelAmount in init.sqf [NEW] More possible causes of death added to study body: fell, ran over, shot, melee hit, zombie hit @ebaydayz [NEW] Player-list no longer shows who's in lobby or ingame. +[NEW] 34 new male clothing classes added. #1732 @AirWavesMan [CHANGED] Combattimeout now uses diag_tickTime instead of time. [CHANGED] AmmoBoxSmall_556/762 is replaced with DZ_AmmoBoxUS/RU/EU/CZ and MedBox0 is replaced with DZ_MedBox (new model) diff --git a/SQF/dayz_code/medical/selfbloodbag.sqf b/SQF/dayz_code/medical/selfbloodbag.sqf index 1a6dd15b6..6faa7dd1e 100644 --- a/SQF/dayz_code/medical/selfbloodbag.sqf +++ b/SQF/dayz_code/medical/selfbloodbag.sqf @@ -1,5 +1,6 @@ if (!DZE_SelfTransfuse) exitWith {}; private ["_unit","_blood","_lowBlood","_injured","_inPain","_lastused","_animState","_started","_finished","_timer","_i","_isMedic","_isClose","_duration","_rhVal","_bloodBagArrayNeeded","_BBneeded","_bbselect","_bloodBagNeeded","_badBag","_wholeBag","_bagFound","_bagToRemove","_forceClose","_bloodType","_rh","_bloodBagArray","_bbarray_length","_bloodBagWholeNeeded","_haswholebag","_r"]; + // bleed.sqf _unit = _this select 0; _bagUsed = _this select 1; diff --git a/SQF/dayz_server/compile/server_playerSync.sqf b/SQF/dayz_server/compile/server_playerSync.sqf index ee9816788..e778746be 100644 --- a/SQF/dayz_server/compile/server_playerSync.sqf +++ b/SQF/dayz_server/compile/server_playerSync.sqf @@ -1,4 +1,4 @@ -private ["_debug","_distance","_distanceFoot","_playerPos","_lastPos","_playerGear","_medical","_currentModel","_currentAnim","_currentWpn","_muzzles","_array","_coins","_key","_globalCoins","_bankCoins","_group","_playerBackp","_backpack","_kills","_killsB","_killsH","_headShots","_humanity","_lastTime","_timeGross","_timeSince","_timeLeft","_config","_onLadder","_isTerminal","_modelChk","_temp","_currentState","_character","_magazines","_characterID","_force","_charPos","_isInVehicle","_name","_Achievements","_isNewMed","_isNewPos","_isNewGear"]; +private ["_distanceFoot","_playerPos","_lastPos","_playerGear","_medical","_currentModel","_currentAnim","_currentWpn","_muzzles","_array","_coins","_key","_globalCoins","_bankCoins","_group","_playerBackp","_backpack","_kills","_killsB","_killsH","_headShots","_humanity","_lastTime","_timeGross","_timeSince","_timeLeft","_config","_onLadder","_isTerminal","_modelChk","_temp","_currentState","_character","_magazines","_characterID","_force","_charPos","_isInVehicle","_name","_Achievements","_isNewMed","_isNewPos","_isNewGear","_debug","_distance"]; //[player,array] _character = _this select 0; @@ -10,6 +10,9 @@ _isInVehicle = vehicle _character != _character; _timeSince = 0; _humanity = 0; _name = if (alive _character) then {name _character} else {"Dead Player"}; +_Achievements = []; +_debug = getMarkerpos "respawn_west"; +_distance = _debug distance _charPos; if (_character isKindOf "Animal") exitWith { diag_log ("ERROR: Cannot Sync Character " + _name + " is an Animal class"); @@ -19,17 +22,12 @@ if (isNil "_characterID") exitWith { diag_log ("ERROR: Cannot Sync Character " + _name + " has nil characterID"); }; -if (_characterID == "0") exitWith { - diag_log ("ERROR: Cannot Sync Character " + _name + " as no characterID"); -}; - -_Achievements = []; - -private["_debug","_distance"]; -_debug = getMarkerpos "respawn_west"; -_distance = _debug distance _charPos; -if (_distance < 1500) exitWith { - diag_log format["ERROR: server_playerSync: Cannot Sync Player %1 [%2]. Position in debug! %3",_name,_characterID,_charPos]; +if (_characterID == "0" or _distance < 1500) exitWith { + if (_distance < 1500) then { + diag_log format["INFO: server_playerSync: Cannot Sync Player %1 [%2]. Position in debug! %3 (May be changing clothes)",_name,_characterID,_charPos]; + } else { + diag_log ("ERROR: Cannot Sync Character " + _name + " as no characterID"); + }; }; //Check for server initiated updates