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

Server_monitor fixes

Browse Source 
revert _serverVehicleCounter to array, since I didn't notice it was
referenced in another file. Don't attempt to load objectData dump if the
vehicle count is 0 since the file won't be created.
This commit is contained in:
icomrade
2016-08-21 14:36:11 -04:00
parent f50666190b
commit 2ef433dc93
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
SQF/dayz_server/system/server_monitor.sqf
View File

@@ -13,7 +13,7 @@ _DZE_VehObjects = [];
dayz_versionNo = getText (configFile >> "CfgMods" >> "DayZ" >> "version"); dayz_versionNo = getText (configFile >> "CfgMods" >> "DayZ" >> "version");
dayz_hiveVersionNo = getNumber (configFile >> "CfgMods" >> "DayZ" >> "hiveVersion"); dayz_hiveVersionNo = getNumber (configFile >> "CfgMods" >> "DayZ" >> "hiveVersion");
_hiveLoaded = false; _hiveLoaded = false;
_serverVehicleCounter = 0; _serverVehicleCounter = [];
_tempMaint = DayZ_WoodenFence + DayZ_WoodenGates; _tempMaint = DayZ_WoodenFence + DayZ_WoodenGates;
_respawnPos = getMarkerpos "respawn_west"; _respawnPos = getMarkerpos "respawn_west";
diag_log "HIVE: Starting"; diag_log "HIVE: Starting";
@@ -48,10 +48,10 @@ diag_log "HIVE: Request sent";
_myArray = []; _myArray = [];
_val = 0; _val = 0;
_status = _result select 0; //Process result _status = _result select 0; //Process result
_val = _result select 1;
if (_legacyStreamingMethod) then { if (_legacyStreamingMethod) then {
if (_status == "ObjectStreamStart") then { if (_status == "ObjectStreamStart") then {
_hiveLoaded = true; _hiveLoaded = true;
_val = _result select 1;
//Stream Objects //Stream Objects
diag_log ("HIVE: Commence Object Streaming..."); diag_log ("HIVE: Commence Object Streaming...");
for "_i" from 1 to _val do { for "_i" from 1 to _val do {
@@ -61,15 +61,17 @@ if (_legacyStreamingMethod) then {
}; };
}; };
} else { } else {
_fileName = _key call server_hiveReadWrite; if (_val > 0) then {
_lastFN = profileNamespace getVariable["lastFN",""]; _fileName = _key call server_hiveReadWrite;
profileNamespace setVariable["lastFN",_fileName]; _lastFN = profileNamespace getVariable["lastFN",""];
saveProfileNamespace; profileNamespace setVariable["lastFN",_fileName];
if (_status == "ObjectStreamStart") then { saveProfileNamespace;
_hiveLoaded = true; if (_status == "ObjectStreamStart") then {
_myArray = Call Compile PreProcessFile _fileName; _hiveLoaded = true;
_key = format["CHILD:302:%1:%2:",_lastFN, _legacyStreamingMethod]; _myArray = Call Compile PreProcessFile _fileName;
_result = _key call server_hiveReadWrite; //deletes previous object data dump _key = format["CHILD:302:%1:%2:",_lastFN, _legacyStreamingMethod];
_result = _key call server_hiveReadWrite; //deletes previous object data dump
};
}; };
}; };
@@ -252,7 +254,7 @@ diag_log ("HIVE: Streamed " + str(_val) + " objects");
_DZE_VehObjects set [count _DZE_VehObjects,_object]; _DZE_VehObjects set [count _DZE_VehObjects,_object];
_object call fnc_veh_ResetEH; _object call fnc_veh_ResetEH;
if (_ownerID != "0" && {!(_object isKindOf "Bicycle")}) then {_object setVehicleLock "locked";}; if (_ownerID != "0" && {!(_object isKindOf "Bicycle")}) then {_object setVehicleLock "locked";};
_serverVehicleCounter = _serverVehicleCounter + 1; // total each vehicle _serverVehicleCounter set [count _serverVehicleCounter,_type]; // total each vehicle
} else { } else {
_object enableSimulation true; _object enableSimulation true;
}; };
@@ -445,7 +447,7 @@ if (_hiveLoaded) then {
} count (dayz_centerMarker nearObjects ["building",DynamicVehicleArea]); } count (dayz_centerMarker nearObjects ["building",DynamicVehicleArea]);
_roadList = dayz_centerMarker nearRoads DynamicVehicleArea; _roadList = dayz_centerMarker nearRoads DynamicVehicleArea;
_vehLimit = MaxVehicleLimit - _serverVehicleCounter; _vehLimit = MaxVehicleLimit - (count _serverVehicleCounter);
if (_vehLimit > 0) then { if (_vehLimit > 0) then {
diag_log ("HIVE: Spawning # of Vehicles: " + str(_vehLimit)); diag_log ("HIVE: Spawning # of Vehicles: " + str(_vehLimit));
for "_x" from 1 to _vehLimit do {call spawn_vehicles;}; for "_x" from 1 to _vehLimit do {call spawn_vehicles;};