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

Delay cleanDead a bit more + remove outcommit debug

Browse Source
This commit is contained in:
Skaronator
2014-01-22 15:21:26 +01:00
parent ddea0d632d
commit f50f264801
1 changed files with 126 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

272
SQF/dayz_server/init/server_functions.sqf
View File

@@ -5,6 +5,14 @@ BIS_MPF_remoteExecutionServer = {
[nil,(_this select 1) select 0,"loc",rJIPEXEC,[any,any,"per","execVM","ca\Modules\Functions\init.sqf"]] call RE; [nil,(_this select 1) select 0,"loc",rJIPEXEC,[any,any,"per","execVM","ca\Modules\Functions\init.sqf"]] call RE;
}; };
}; };
/* Skaronator - secured better remoteExecServer
BIS_MPF_remoteExecutionServer = {
if ((_this select 1) select 2 == "JIPrequest") then {
_playerObj = (_this select 1) select 0;
remExField = [nil, nil, format ["";if !(isServer) then {[] execVM "ca\Modules\Functions\init.sqf";};""]];
(owner _playerObj) publicVariableClient "remExField";
};
};*/
BIS_Effects_Burn = {}; BIS_Effects_Burn = {};
server_playerLogin = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerLogin.sqf"; server_playerLogin = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerLogin.sqf";
@@ -34,6 +42,8 @@ server_maintainArea = compile preprocessFileLineNumbers "\z\addons\dayz_serve
/* PVS/PVC - Skaronator */ /* PVS/PVC - Skaronator */
server_sendToClient = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_sendToClient.sqf"; server_sendToClient = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_sendToClient.sqf";
onPlayerDisconnected "[_uid,_name] call server_onPlayerDisconnect;";
vehicle_handleInteract = { vehicle_handleInteract = {
private["_object"]; private["_object"];
_object = _this select 0; _object = _this select 0;
@@ -106,10 +116,7 @@ check_publishobject = {
_object = _this select 0; _object = _this select 0;
_playername = _this select 1; _playername = _this select 1;
_allowed = false; _allowed = false;
//diag_log format ["DEBUG: Checking if Object: %1 is allowed published by %2", _object, _playername];
if ((typeOf _object) in dayz_allowedObjects) then { if ((typeOf _object) in dayz_allowedObjects) then {
//diag_log format ["DEBUG: Object: %1 published by %2 is Safe",_object, _playername]; //diag_log format ["DEBUG: Object: %1 published by %2 is Safe",_object, _playername];
@@ -119,7 +126,7 @@ check_publishobject = {
}; };
//event Handlers //event Handlers
eh_localCleanup = { eh_localCleanup = {
private ["_object"]; private ["_object"];
_object = _this select 0; _object = _this select 0;
_object addEventHandler ["local", { _object addEventHandler ["local", {
@@ -149,34 +156,26 @@ eh_localCleanup = {
server_hiveWrite = { server_hiveWrite = {
private["_data"]; private["_data"];
//diag_log ("ATTEMPT WRITE: " + _this);
_data = "HiveExt" callExtension _this; _data = "HiveExt" callExtension _this;
//diag_log ("WRITE: " +str(_data));
}; };
server_hiveReadWrite = { server_hiveReadWrite = {
private["_key","_resultArray","_data"]; private["_key","_resultArray","_data"];
_key = _this; _key = _this;
//diag_log ("ATTEMPT READ/WRITE: " + _key);
_data = "HiveExt" callExtension _key; _data = "HiveExt" callExtension _key;
// diag_log ("READ/WRITE: " +str(_data));
_resultArray = call compile format ["%1",_data]; _resultArray = call compile format ["%1",_data];
_resultArray _resultArray
}; };
server_maintainObj = { server_maintainObj = {
private["_data"]; private["_data"];
//diag_log ("ATTEMPT WRITE: " + _this);
_data = "HiveExt" callExtension _this; _data = "HiveExt" callExtension _this;
//diag_log ("WRITE: " +str(_data));
}; };
server_hiveReadWriteLarge = { server_hiveReadWriteLarge = {
private["_key","_resultArray","_data"]; private["_key","_resultArray","_data"];
_key = _this; _key = _this;
//diag_log ("ATTEMPT READ/WRITE: " + _key);
_data = "HiveExt" callExtension _key; _data = "HiveExt" callExtension _key;
// diag_log ("READ/WRITE: " +str(_data));
_resultArray = call compile _data; _resultArray = call compile _data;
_resultArray _resultArray
}; };
@@ -192,15 +191,9 @@ server_characterSync = {
_currentModel = _this select 6; _currentModel = _this select 6;
_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,0,0,0,0,_currentState,0,0,_currentModel,0]; _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,0,0,0,0,_currentState,0,0,_currentModel,0];
//diag_log ("HIVE: WRITE: "+ str(_key) + " / " + _characterID);
_key call server_hiveWrite; _key call server_hiveWrite;
}; };
//onPlayerConnected "[_uid,_name] spawn server_onPlayerConnect;";
onPlayerDisconnected "[_uid,_name] call server_onPlayerDisconnect;";
// Setup globals allow overwrite from init.sqf
if(isnil "dayz_MapArea") then { if(isnil "dayz_MapArea") then {
dayz_MapArea = 10000; dayz_MapArea = 10000;
}; };
@@ -224,137 +217,136 @@ BuildingList = [];
spawn_vehicles = { spawn_vehicles = {
private ["_random","_lastIndex","_weights","_index","_vehicle","_velimit","_qty","_isAir","_isShip","_position","_dir","_istoomany","_veh","_objPosition","_marker","_iClass","_itemTypes","_cntWeights","_itemType","_num","_allCfgLoots"]; private ["_random","_lastIndex","_weights","_index","_vehicle","_velimit","_qty","_isAir","_isShip","_position","_dir","_istoomany","_veh","_objPosition","_marker","_iClass","_itemTypes","_cntWeights","_itemType","_num","_allCfgLoots"];
if (isDedicated) then { if (!isDedicated) exitWith { }; //Be sure the run this
while {count AllowedVehiclesList > 0} do { while {count AllowedVehiclesList > 0} do {
// BIS_fnc_selectRandom replaced because the index may be needed to remove the element // BIS_fnc_selectRandom replaced because the index may be needed to remove the element
_index = floor random count AllowedVehiclesList; _index = floor random count AllowedVehiclesList;
_random = AllowedVehiclesList select _index; _random = AllowedVehiclesList select _index;
_vehicle = _random select 0; _vehicle = _random select 0;
_velimit = _random select 1; _velimit = _random select 1;
_qty = {_x == _vehicle} count serverVehicleCounter; _qty = {_x == _vehicle} count serverVehicleCounter;
// If under limit allow to proceed // If under limit allow to proceed
if (_qty <= _velimit) exitWith {}; if (_qty <= _velimit) exitWith {};
// vehicle limit reached, remove vehicle from list // vehicle limit reached, remove vehicle from list
// since elements cannot be removed from an array, overwrite it with the last element and cut the last element of (as long as order is not important) // since elements cannot be removed from an array, overwrite it with the last element and cut the last element of (as long as order is not important)
_lastIndex = (count AllowedVehiclesList) - 1; _lastIndex = (count AllowedVehiclesList) - 1;
if (_lastIndex != _index) then { if (_lastIndex != _index) then {
AllowedVehiclesList set [_index, AllowedVehiclesList select _lastIndex]; AllowedVehiclesList set [_index, AllowedVehiclesList select _lastIndex];
};
AllowedVehiclesList resize _lastIndex;
}; };
AllowedVehiclesList resize _lastIndex;
};
if (count AllowedVehiclesList == 0) then { if (count AllowedVehiclesList == 0) then {
diag_log("DEBUG: unable to find suitable vehicle to spawn"); diag_log("DEBUG: unable to find suitable vehicle to spawn");
} else {
// add vehicle to counter for next pass
serverVehicleCounter set [count serverVehicleCounter,_vehicle];
// Find Vehicle Type to better control spawns
_isAir = _vehicle isKindOf "Air";
_isShip = _vehicle isKindOf "Ship";
if(_isShip || _isAir) then {
if(_isShip) then {
// Spawn anywhere on coast on water
waitUntil{!isNil "BIS_fnc_findSafePos"};
_position = [MarkerPosition,0,DynamicVehicleArea,10,1,2000,1] call BIS_fnc_findSafePos;
//diag_log("DEBUG: spawning boat near coast " + str(_position));
} else {
// Spawn air anywhere that is flat
waitUntil{!isNil "BIS_fnc_findSafePos"};
_position = [MarkerPosition,0,DynamicVehicleArea,10,0,2000,0] call BIS_fnc_findSafePos;
//diag_log("DEBUG: spawning air anywhere flat " + str(_position));
};
} else { } else {
// Spawn around buildings and 50% near roads
// add vehicle to counter for next pass if((random 1) > 0.5) then {
serverVehicleCounter set [count serverVehicleCounter,_vehicle];
// Find Vehicle Type to better control spawns
_isAir = _vehicle isKindOf "Air";
_isShip = _vehicle isKindOf "Ship";
if(_isShip || _isAir) then {
if(_isShip) then {
// Spawn anywhere on coast on water
waitUntil{!isNil "BIS_fnc_findSafePos"};
_position = [MarkerPosition,0,DynamicVehicleArea,10,1,2000,1] call BIS_fnc_findSafePos;
//diag_log("DEBUG: spawning boat near coast " + str(_position));
} else {
// Spawn air anywhere that is flat
waitUntil{!isNil "BIS_fnc_findSafePos"};
_position = [MarkerPosition,0,DynamicVehicleArea,10,0,2000,0] call BIS_fnc_findSafePos;
//diag_log("DEBUG: spawning air anywhere flat " + str(_position));
};
waitUntil{!isNil "BIS_fnc_selectRandom"};
_position = RoadList call BIS_fnc_selectRandom;
_position = _position modelToWorld [0,0,0];
waitUntil{!isNil "BIS_fnc_findSafePos"};
_position = [_position,0,10,10,0,2000,0] call BIS_fnc_findSafePos;
//diag_log("DEBUG: spawning near road " + str(_position));
} else { } else {
// Spawn around buildings and 50% near roads
if((random 1) > 0.5) then {
waitUntil{!isNil "BIS_fnc_selectRandom"};
_position = RoadList call BIS_fnc_selectRandom;
_position = _position modelToWorld [0,0,0];
waitUntil{!isNil "BIS_fnc_findSafePos"};
_position = [_position,0,10,10,0,2000,0] call BIS_fnc_findSafePos;
//diag_log("DEBUG: spawning near road " + str(_position));
} else {
waitUntil{!isNil "BIS_fnc_selectRandom"};
_position = BuildingList call BIS_fnc_selectRandom;
_position = _position modelToWorld [0,0,0];
waitUntil{!isNil "BIS_fnc_findSafePos"};
_position = [_position,0,40,5,0,2000,0] call BIS_fnc_findSafePos;
//diag_log("DEBUG: spawning around buildings " + str(_position));
}; waitUntil{!isNil "BIS_fnc_selectRandom"};
}; _position = BuildingList call BIS_fnc_selectRandom;
// only proceed if two params otherwise BIS_fnc_findSafePos failed and may spawn in air
if ((count _position) == 2) then { _position = _position modelToWorld [0,0,0];
waitUntil{!isNil "BIS_fnc_findSafePos"};
_position = [_position,0,40,5,0,2000,0] call BIS_fnc_findSafePos;
//diag_log("DEBUG: spawning around buildings " + str(_position));
_dir = round(random 180); };
};
// only proceed if two params otherwise BIS_fnc_findSafePos failed and may spawn in air
if ((count _position) == 2) then {
_dir = round(random 180);
_istoomany = _position nearObjects ["AllVehicles",50];
if((count _istoomany) > 0) exitWith { diag_log("DEBUG: Too many vehicles at " + str(_position)); };
//place vehicle
_veh = createVehicle [_vehicle, _position, [], 0, "CAN_COLLIDE"];
_veh setdir _dir;
_veh setpos _position;
_istoomany = _position nearObjects ["AllVehicles",50]; if(DZEdebug) then {
if((count _istoomany) > 0) exitWith { diag_log("DEBUG: Too many vehicles at " + str(_position)); }; _marker = createMarker [str(_position) , _position];
_marker setMarkerShape "ICON";
//place vehicle _marker setMarkerType "DOT";
_veh = createVehicle [_vehicle, _position, [], 0, "CAN_COLLIDE"]; _marker setMarkerText _vehicle;
_veh setdir _dir; };
_veh setpos _position;
// Get position with ground
if(DZEdebug) then { _objPosition = getPosATL _veh;
_marker = createMarker [str(_position) , _position];
_marker setMarkerShape "ICON"; clearWeaponCargoGlobal _veh;
_marker setMarkerType "DOT"; clearMagazineCargoGlobal _veh;
_marker setMarkerText _vehicle; // _veh setVehicleAmmo DZE_vehicleAmmo;
};
// Get position with ground
_objPosition = getPosATL _veh;
clearWeaponCargoGlobal _veh;
clearMagazineCargoGlobal _veh;
// _veh setVehicleAmmo DZE_vehicleAmmo;
// Add 0-3 loots to vehicle using random cfgloots // Add 0-3 loots to vehicle using random cfgloots
_num = floor(random 4); _num = floor(random 4);
_allCfgLoots = ["trash","civilian","food","generic","medical","military","policeman","hunter","worker","clothes","militaryclothes","specialclothes","trash"]; _allCfgLoots = ["trash","civilian","food","generic","medical","military","policeman","hunter","worker","clothes","militaryclothes","specialclothes","trash"];
for "_x" from 1 to _num do { for "_x" from 1 to _num do {
_iClass = _allCfgLoots call BIS_fnc_selectRandom; _iClass = _allCfgLoots call BIS_fnc_selectRandom;
_itemTypes = []; _itemTypes = [];
if (DZE_MissionLootTable) then { if (DZE_MissionLootTable) then {
_itemTypes = ((getArray (missionConfigFile >> "cfgLoot" >> _iClass)) select 0); _itemTypes = ((getArray (missionConfigFile >> "cfgLoot" >> _iClass)) select 0);
} else { } else {
_itemTypes = ((getArray (configFile >> "cfgLoot" >> _iClass)) select 0); _itemTypes = ((getArray (configFile >> "cfgLoot" >> _iClass)) select 0);
};
_index = dayz_CLBase find _iClass;
_weights = dayz_CLChances select _index;
_cntWeights = count _weights;
_index = floor(random _cntWeights);
_index = _weights select _index;
_itemType = _itemTypes select _index;
_veh addMagazineCargoGlobal [_itemType,1];
//diag_log("DEBUG: spawed loot inside vehicle " + str(_itemType));
}; };
[_veh,[_dir,_objPosition],_vehicle,true,"0"] call server_publishVeh; _index = dayz_CLBase find _iClass;
_weights = dayz_CLChances select _index;
_cntWeights = count _weights;
_index = floor(random _cntWeights);
_index = _weights select _index;
_itemType = _itemTypes select _index;
_veh addMagazineCargoGlobal [_itemType,1];
//diag_log("DEBUG: spawed loot inside vehicle " + str(_itemType));
}; };
[_veh,[_dir,_objPosition],_vehicle,true,"0"] call server_publishVeh;
}; };
}; };
}; };
@@ -424,17 +416,11 @@ spawn_roadblocks = {
_marker setMarkerType "DOT"; _marker setMarkerType "DOT";
_marker setMarkerText str(_spawnveh); _marker setMarkerText str(_spawnveh);
}; };
// fill array with classes and positions [class,pos,dir]
// DZE_LocalRoadBlocks set [count DZE_LocalRoadBlocks,[_spawnveh,_position,round(random 360)]];
//diag_log("DEBUG: Spawning a crashed " + _spawnveh + " with " + _spawnloot + " at " + str(_position));
_veh = createVehicle [_spawnveh,_position, [], 0, "CAN_COLLIDE"]; _veh = createVehicle [_spawnveh,_position, [], 0, "CAN_COLLIDE"];
_veh enableSimulation false; _veh enableSimulation false;
// Randomize placement a bit _veh setDir round(random 360); // Randomize placement a bit
_veh setDir round(random 360);
_veh setpos _position; _veh setpos _position;
_veh setVariable ["ObjectID","1",true]; _veh setVariable ["ObjectID","1",true];
@@ -458,7 +444,6 @@ spawn_mineveins = {
_position = (_positions call BIS_fnc_selectRandom) select 0; _position = (_positions call BIS_fnc_selectRandom) select 0;
// Get position with ground // Get position with ground
_istoomany = _position nearObjects ["All",10]; _istoomany = _position nearObjects ["All",10];
if((count _istoomany) > 0) exitWith { diag_log("DEBUG VEIN: Too many objects at " + str(_position)); }; if((count _istoomany) > 0) exitWith { diag_log("DEBUG VEIN: Too many objects at " + str(_position)); };
@@ -715,7 +700,7 @@ dayz_removePlayerOnDisconnect = {
server_timeSync = { server_timeSync = {
//Send request //Send request
private ["_year","_month","_day","_hour","_minute","_date","_key","_result","_outcome"]; private ["_hour","_minute","_date","_key","_result","_outcome"];
_key = "CHILD:307:"; _key = "CHILD:307:";
_result = _key call server_hiveReadWrite; _result = _key call server_hiveReadWrite;
_outcome = _result select 0; _outcome = _result select 0;
@@ -725,7 +710,6 @@ server_timeSync = {
if(dayz_fullMoonNights) then { if(dayz_fullMoonNights) then {
_hour = _date select 3; _hour = _date select 3;
_minute = _date select 4; _minute = _date select 4;
//Force full moon nights //Force full moon nights
_date = [2013,8,3,_hour,_minute]; _date = [2013,8,3,_hour,_minute];
}; };
@@ -740,7 +724,6 @@ server_timeSync = {
// must spawn these // must spawn these
server_spawncleanDead = { server_spawncleanDead = {
private ["_deathTime","_delQtyZ","_delQtyP","_qty","_allDead"]; private ["_deathTime","_delQtyZ","_delQtyP","_qty","_allDead"];
_allDead = allDead; _allDead = allDead;
_delQtyZ = 0; _delQtyZ = 0;
_delQtyP = 0; _delQtyP = 0;
@@ -752,7 +735,6 @@ server_spawncleanDead = {
sleep 0.05; sleep 0.05;
_delQtyZ = _delQtyZ + 1; _delQtyZ = _delQtyZ + 1;
} else { } else {
if (_x isKindOf "CAManBase") then { if (_x isKindOf "CAManBase") then {
_deathTime = _x getVariable ["processedDeath", diag_tickTime]; _deathTime = _x getVariable ["processedDeath", diag_tickTime];
if (diag_tickTime - _deathTime > 1800) then { if (diag_tickTime - _deathTime > 1800) then {
@@ -763,7 +745,7 @@ server_spawncleanDead = {
}; };
}; };
}; };
sleep 0.001; sleep 0.025;
} forEach _allDead; } forEach _allDead;
if (_delQtyZ > 0 or _delQtyP > 0) then { if (_delQtyZ > 0 or _delQtyP > 0) then {
_qty = count _allDead; _qty = count _allDead;
@@ -775,10 +757,8 @@ server_cleanupGroups = {
if(!isNil "DZE_DYN_GroupCleanup") exitWith { DZE_DYN_AntiStuck3rd = DZE_DYN_AntiStuck3rd + 1;}; if(!isNil "DZE_DYN_GroupCleanup") exitWith { DZE_DYN_AntiStuck3rd = DZE_DYN_AntiStuck3rd + 1;};
DZE_DYN_GroupCleanup = true; DZE_DYN_GroupCleanup = true;
{ {
// diag_log ("CLEANUP: CHECKING GROUP WITH " + str(count units _x) + " UNITS");
if (count units _x == 0) then { if (count units _x == 0) then {
deleteGroup _x; deleteGroup _x;
// diag_log ("CLEANUP: DELETING A GROUP");
}; };
sleep 0.001; sleep 0.001;
} forEach allGroups; } forEach allGroups;