W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove redundant characterID check in server_playerSync

Browse Source 
I made no changes apart from removing the (_characterID != "0") check
and the corresponding spacing/tabs.

If _characterID == "0" the script would have already exited on line 30.
This commit is contained in:
ebaydayz
2016-09-17 12:18:54 -04:00
parent a63da4606d
commit bc4cb49463
1 changed files with 185 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

175
SQF/dayz_server/compile/server_playerSync.sqf
View File

@@ -42,44 +42,43 @@ _isNewGear = if (!isNil "_magazines") then { true } else { false };
//diag_log ("Starting Save... MED: " + str(_isNewMed) + " / POS: " + str(_isNewPos)); sleep 0.05; //diag_log ("Starting Save... MED: " + str(_isNewMed) + " / POS: " + str(_isNewPos)); sleep 0.05;
//Check for player initiated updates //Check for player initiated updates
if (_characterID != "0") then { _playerPos = [];
_playerPos = []; _playerGear = [];
_playerGear = []; _playerBackp = [];
_playerBackp = []; _medical = [];
_medical = []; _distanceFoot = 0;
_distanceFoot = 0;
//all getVariable immediately //all getVariable immediately
_globalCoins = _character getVariable ["GlobalMoney", -1]; _globalCoins = _character getVariable ["GlobalMoney", -1];
_bankCoins = _character getVariable ["MoneySpecial", -1]; _bankCoins = _character getVariable ["MoneySpecial", -1];
_group = _character getVariable ["savedGroup", []]; _group = _character getVariable ["savedGroup", []];
_coins = _character getVariable [Z_MoneyVariable, -1]; //should getting coins fail set the variable to an invalid value to prevent overwritting the in the DB _coins = _character getVariable [Z_MoneyVariable, -1]; //should getting coins fail set the variable to an invalid value to prevent overwritting the in the DB
_lastPos = _character getVariable ["lastPos",_charPos]; _lastPos = _character getVariable ["lastPos",_charPos];
_usec_Dead = _character getVariable ["USEC_isDead",false]; _usec_Dead = _character getVariable ["USEC_isDead",false];
_lastTime = _character getVariable ["lastTime",diag_ticktime]; _lastTime = _character getVariable ["lastTime",diag_ticktime];
_modelChk = _character getVariable ["model_CHK",""]; _modelChk = _character getVariable ["model_CHK",""];
_temp = round (_character getVariable ["temperature",100]); _temp = round (_character getVariable ["temperature",100]);
_lastMagazines = _character getVariable ["ServerMagArray",[[],""]]; _lastMagazines = _character getVariable ["ServerMagArray",[[],""]];
/* /*
Check previous stats against what client had when they logged in Check previous stats against what client had when they logged in
this helps prevent JIP issues, where a new player wouldn't have received this helps prevent JIP issues, where a new player wouldn't have received
the old players updates. Only valid for stats where clients could have the old players updates. Only valid for stats where clients could have
be recording results from their local objects (such as agent zombies) be recording results from their local objects (such as agent zombies)
*/ */
_kills = ["zombieKills",_character] call server_getDiff; _kills = ["zombieKills",_character] call server_getDiff;
_killsB = ["banditKills",_character] call server_getDiff; _killsB = ["banditKills",_character] call server_getDiff;
_killsH = ["humanKills",_character] call server_getDiff; _killsH = ["humanKills",_character] call server_getDiff;
_headShots = ["headShots",_character] call server_getDiff; _headShots = ["headShots",_character] call server_getDiff;
_humanity = ["humanity",_character] call server_getDiff2; _humanity = ["humanity",_character] call server_getDiff2;
_charPosLen = count _charPos; _charPosLen = count _charPos;
if (_isNewGear) then { if (_isNewGear) then {
if (typeName _magazines == "ARRAY") then { if (typeName _magazines == "ARRAY") then {
_playerGear = [weapons _character,_magazines select 0,_magazines select 1]; _playerGear = [weapons _character,_magazines select 0,_magazines select 1];
_character setVariable["ServerMagArray",_magazines, false]; _character setVariable["ServerMagArray",_magazines, false];
}; };
} else { } else {
//check Magazines everytime they aren't sent by player_forceSave //check Magazines everytime they aren't sent by player_forceSave
_magTemp = (_lastMagazines select 0); _magTemp = (_lastMagazines select 0);
if (count _magTemp > 0) then { if (count _magTemp > 0) then {
@@ -104,10 +103,10 @@ if (_characterID != "0") then {
_character setVariable["ServerMagArray",_magazines, false]; _character setVariable["ServerMagArray",_magazines, false];
_playerGear = [weapons _character,_magazines select 0,_magazines select 1]; _playerGear = [weapons _character,_magazines select 0,_magazines select 1];
}; };
}; };
//Check if update is requested //Check if update is requested
if (_isNewPos or _force) then { if (_isNewPos or _force) then {
//diag_log ("position..." + str(_isNewPos) + " / " + str(_force)); sleep 0.05; //diag_log ("position..." + str(_isNewPos) + " / " + str(_force)); sleep 0.05;
if (((_charPos select 0) == 0) && ((_charPos select 1) == 0)) then { if (((_charPos select 0) == 0) && ((_charPos select 1) == 0)) then {
//Zero Position //Zero Position
@@ -122,13 +121,13 @@ if (_characterID != "0") then {
//diag_log ("position = " + str(_playerPos)); sleep 0.05; //diag_log ("position = " + str(_playerPos)); sleep 0.05;
}; };
_character setVariable ["posForceUpdate",false,true]; _character setVariable ["posForceUpdate",false,true];
}; };
//Check player backpack each time sync runs //Check player backpack each time sync runs
_backpack = unitBackpack _character; _backpack = unitBackpack _character;
_playerBackp = [typeOf _backpack,getWeaponCargo _backpack,getMagazineCargo _backpack]; _playerBackp = [typeOf _backpack,getWeaponCargo _backpack,getMagazineCargo _backpack];
if (_isNewMed or _force) then { if (_isNewMed or _force) then {
//diag_log ("medical..."); sleep 0.05; //diag_log ("medical..."); sleep 0.05;
if (!_usec_Dead) then { if (!_usec_Dead) then {
//diag_log ("medical check..."); sleep 0.05; //diag_log ("medical check..."); sleep 0.05;
@@ -136,29 +135,29 @@ if (_characterID != "0") then {
//diag_log ("medical result..." + str(_medical)); sleep 0.05; //diag_log ("medical result..." + str(_medical)); sleep 0.05;
}; };
_character setVariable ["medForceUpdate",false,true]; _character setVariable ["medForceUpdate",false,true];
}; };
_character addScore _kills; _character addScore _kills;
_timeGross = (diag_ticktime - _lastTime); _timeGross = (diag_ticktime - _lastTime);
_timeSince = floor (_timeGross / 60); _timeSince = floor (_timeGross / 60);
_timeLeft = (_timeGross - (_timeSince * 60)); _timeLeft = (_timeGross - (_timeSince * 60));
/* /*
Get character state details Get character state details
*/ */
_currentWpn = currentMuzzle _character; _currentWpn = currentMuzzle _character;
_currentAnim = animationState _character; _currentAnim = animationState _character;
_config = configFile >> "CfgMovesMaleSdr" >> "States" >> _currentAnim; _config = configFile >> "CfgMovesMaleSdr" >> "States" >> _currentAnim;
_onLadder = (getNumber (_config >> "onLadder")) == 1; _onLadder = (getNumber (_config >> "onLadder")) == 1;
_isTerminal = (getNumber (_config >> "terminal")) == 1; _isTerminal = (getNumber (_config >> "terminal")) == 1;
//_wpnDisabled = (getNumber (_config >> "disableWeapons")) == 1; //_wpnDisabled = (getNumber (_config >> "disableWeapons")) == 1;
_currentModel = typeOf _character; _currentModel = typeOf _character;
if (_currentModel == _modelChk) then { if (_currentModel == _modelChk) then {
_currentModel = ""; _currentModel = "";
} else { } else {
_currentModel = str _currentModel; _currentModel = str _currentModel;
_character setVariable ["model_CHK",typeOf _character]; _character setVariable ["model_CHK",typeOf _character];
}; };
if ((count _this) > 3 && {_isInVehicle}) then { //calling from player_onDisconnect if ((count _this) > 3 && {_isInVehicle}) then { //calling from player_onDisconnect
//if the player object is inside a vehicle lets eject the player //if the player object is inside a vehicle lets eject the player
_relocate = if (vehicle _playerObj isKindOf "Air") then {true} else {false}; _relocate = if (vehicle _playerObj isKindOf "Air") then {true} else {false};
_playerObj action ["eject", vehicle _playerObj]; _playerObj action ["eject", vehicle _playerObj];
@@ -176,18 +175,18 @@ if (_characterID != "0") then {
}; };
diag_log format["%1(%2) logged out in air vehicle. Relocated to safePos %3m from logout position.",(name _character),(getPlayerUID _character),_charPos distance _newPos]; diag_log format["%1(%2) logged out in air vehicle. Relocated to safePos %3m from logout position.",(name _character),(getPlayerUID _character),_charPos distance _newPos];
}; };
}; };
if (_onLadder or _isInVehicle or _isTerminal) then { if (_onLadder or _isInVehicle or _isTerminal) then {
_currentAnim = ""; _currentAnim = "";
//If position to be updated, make sure it is at ground level! //If position to be updated, make sure it is at ground level!
if ((count _playerPos > 0) && !_isTerminal) then { if ((count _playerPos > 0) && !_isTerminal) then {
_charPos set [2,0]; _charPos set [2,0];
_playerPos set [1,_charPos]; _playerPos set [1,_charPos];
}; };
}; };
if (_isInVehicle) then { if (_isInVehicle) then {
_currentWpn = ""; _currentWpn = "";
} else { } else {
if (typeName _currentWpn == "STRING") then { if (typeName _currentWpn == "STRING") then {
_muzzles = getArray (configFile >> "cfgWeapons" >> _currentWpn >> "muzzles"); _muzzles = getArray (configFile >> "cfgWeapons" >> _currentWpn >> "muzzles");
if (count _muzzles > 1) then {_currentWpn = currentMuzzle _character;}; if (count _muzzles > 1) then {_currentWpn = currentMuzzle _character;};
@@ -195,51 +194,49 @@ if (_characterID != "0") then {
//diag_log ("DW_DEBUG: _currentWpn: " + str(_currentWpn)); //diag_log ("DW_DEBUG: _currentWpn: " + str(_currentWpn));
_currentWpn = ""; _currentWpn = "";
}; };
}; };
_currentState = [[_currentWpn,_currentAnim,_temp],_Achievements]; _currentState = [[_currentWpn,_currentAnim,_temp],_Achievements];
/* /*
Everything is ready, now publish to HIVE Everything is ready, now publish to HIVE
*/ */
if (count _playerPos > 0) then { if (count _playerPos > 0) then {
_array = []; _array = [];
{ {
if (_x > dayz_minpos && _x < dayz_maxpos) then {_array set [count _array,_x];}; if (_x > dayz_minpos && _x < dayz_maxpos) then {_array set [count _array,_x];};
} forEach (_playerPos select 1); } forEach (_playerPos select 1);
_playerPos set [1,_array]; _playerPos set [1,_array];
}; };
//Wait for HIVE to be free and send request //Wait for HIVE to be free and send request
if (Z_SingleCurrency) then { if (Z_SingleCurrency) then {
_key = format["CHILD:201:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:%17:",_characterID,_playerPos,_playerGear,_playerBackp,_medical,false,false,_kills,_headShots,_distanceFoot,_timeSince,_currentState,_killsH,_killsB,_currentModel,_humanity,_coins]; _key = format["CHILD:201:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:%17:",_characterID,_playerPos,_playerGear,_playerBackp,_medical,false,false,_kills,_headShots,_distanceFoot,_timeSince,_currentState,_killsH,_killsB,_currentModel,_humanity,_coins];
} else { } else {
_key = format["CHILD:201:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:",_characterID,_playerPos,_playerGear,_playerBackp,_medical,false,false,_kills,_headShots,_distanceFoot,_timeSince,_currentState,_killsH,_killsB,_currentModel,_humanity]; _key = format["CHILD:201:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:",_characterID,_playerPos,_playerGear,_playerBackp,_medical,false,false,_kills,_headShots,_distanceFoot,_timeSince,_currentState,_killsH,_killsB,_currentModel,_humanity];
}; };
//diag_log ("HIVE: WRITE: "+ str(_key) + " / " + _characterID); //diag_log ("HIVE: WRITE: "+ str(_key) + " / " + _characterID);
//diag_log format["HIVE: SYNC: [%1,%2,%3,%4]",_characterID,_playerPos,_playerGear,_playerBackp]; //diag_log format["HIVE: SYNC: [%1,%2,%3,%4]",_characterID,_playerPos,_playerGear,_playerBackp];
_key call server_hiveWrite; _key call server_hiveWrite;
if (Z_SingleCurrency) then { //update global coins if (Z_SingleCurrency) then { //update global coins
_key = format["CHILD:205:%1:%2:%3:%4:",(getPlayerUID _character),dayZ_instance,_globalCoins,_bankCoins]; _key = format["CHILD:205:%1:%2:%3:%4:",(getPlayerUID _character),dayZ_instance,_globalCoins,_bankCoins];
_key call server_hiveWrite; _key call server_hiveWrite;
}; };
if (DZE_groupManagement) then { //update player group if (DZE_groupManagement) then { //update player group
_key = format["CHILD:204:%1:%2:%3:",(getPlayerUID _character),dayZ_instance, _group]; _key = format["CHILD:204:%1:%2:%3:",(getPlayerUID _character),dayZ_instance, _group];
_key call server_hiveWrite; _key call server_hiveWrite;
}; };
// If player is in a vehicle, keep its position updated // If player is in a vehicle, keep its position updated
if (vehicle _character != _character) then { if (vehicle _character != _character) then {
[vehicle _character, "position"] call server_updateObject; [vehicle _character, "position"] call server_updateObject;
}; };
// Force gear updates for nearby vehicles/tents // Force gear updates for nearby vehicles/tents
{[_x,"gear"] call server_updateObject;} count nearestObjects [_character,DayZ_GearedObjects,10]; {[_x,"gear"] call server_updateObject;} count nearestObjects [_character,DayZ_GearedObjects,10];
//Reset timer //Reset timer
if (_timeSince > 0) then { if (_timeSince > 0) then {
_character setVariable ["lastTime",(diag_ticktime - _timeLeft)]; _character setVariable ["lastTime",(diag_ticktime - _timeLeft)];
};
//};
}; };