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

added wait for server plus fixes

Browse Source 
for network object not found spam
This commit is contained in:
vbawol
2013-06-20 08:56:28 -05:00
parent 69d3438058
commit ebb9f0351c
2 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dayz_server/compile/server_playerDeaths.sqf
View File

@@ -9,6 +9,8 @@ diag_log(PlayerDeaths);
dayzPlayerDeathsResult = PlayerDeaths; dayzPlayerDeathsResult = PlayerDeaths;
_clientID publicVariableClient "dayzPlayerDeathsResult"; if(!isNull _character) then {
_clientID publicVariableClient "dayzPlayerDeathsResult";
};
PlayerDeaths PlayerDeaths

15
dayz_server/compile/server_playerLogin.sqf
View File

@@ -10,6 +10,12 @@ _playerName = name _playerObj;
if (_playerName == '__SERVER__' || _playerID == '' || local player) exitWith {}; if (_playerName == '__SERVER__' || _playerID == '' || local player) exitWith {};
// Cancel any login until server_monitor terminates.
// This is mandatory since all vehicles must be spawned before the first players spawn on the map.
// Otherwise, all vehicle event handlers won't be created on players' client side.
if (isNil "sm_done") exitWith { diag_log ("Login cancelled, server is not ready. " + str(_playerObj)); };
if (count _this > 2) then { if (count _this > 2) then {
dayz_players = dayz_players - [_this select 2]; dayz_players = dayz_players - [_this select 2];
}; };
@@ -98,7 +104,8 @@ if (!_isNew) then {
}; };
}; };
//Record initial inventory //Record initial inventory only if not player zombie
if(_isInfected != 1) then {
_config = (configFile >> "CfgSurvival" >> "Inventory" >> "Default"); _config = (configFile >> "CfgSurvival" >> "Inventory" >> "Default");
_mags = getArray (_config >> "magazines"); _mags = getArray (_config >> "magazines");
_wpns = getArray (_config >> "weapons"); _wpns = getArray (_config >> "weapons");
@@ -118,7 +125,7 @@ if (!_isNew) then {
//Wait for HIVE to be free //Wait for HIVE to be free
_key = format["CHILD:203:%1:%2:%3:",_charID,[_wpns,_mags],[_bcpk,[],[]]]; _key = format["CHILD:203:%1:%2:%3:",_charID,[_wpns,_mags],[_bcpk,[],[]]];
_key call server_hiveWrite; _key call server_hiveWrite;
};
}; };
diag_log ("LOGIN LOADED: " + str(_playerObj) + " Type: " + (typeOf _playerObj)); diag_log ("LOGIN LOADED: " + str(_playerObj) + " Type: " + (typeOf _playerObj));
@@ -132,4 +139,6 @@ if (_hiveVer >= dayz_hiveVersionNo) then {
//_playerObj setVariable ["publish",[_charID,_inventory,_backpack,_survival,_isNew,dayz_versionNo,_model,_isHiveOk,_newPlayer],true]; //_playerObj setVariable ["publish",[_charID,_inventory,_backpack,_survival,_isNew,dayz_versionNo,_model,_isHiveOk,_newPlayer],true];
dayzPlayerLogin = [_charID,_inventory,_backpack,_survival,_isNew,dayz_versionNo,_model,_isHiveOk,_newPlayer,_isInfected]; dayzPlayerLogin = [_charID,_inventory,_backpack,_survival,_isNew,dayz_versionNo,_model,_isHiveOk,_newPlayer,_isInfected];
(owner _playerObj) publicVariableClient "dayzPlayerLogin"; if(!isNull _playerObj) then {
(owner _playerObj) publicVariableClient "dayzPlayerLogin";
};