Fix live animals being deleted in front of players

Vanilla commits:

e14d45a55b

9d6be1731e
This commit is contained in:
ebaydayz
2016-11-21 18:49:03 -05:00
parent d7ecf29744
commit 0483fa61f6
2 changed files with 9 additions and 6 deletions

View File

@@ -3,8 +3,7 @@ class CAAnimalBase: Animal
{ {
class Eventhandlers class Eventhandlers
{ {
//local = "_z = _this select 0; if ((!isServer and !isNull _z) and {(side _z != civilian)}) exitWith { PVDZ_sec_atp = [ 'wrong side', player ]; publicVariableServer 'PVDZ_sec_atp'; deleteVehicle _z; }; if ((_this select 1) and isServer) exitWith { _z call sched_co_deleteVehicle; };"; //local = "_z = _this select 0; if ((!isServer and !isNull _z) and {(side _z != civilian)}) exitWith { PVDZ_sec_atp = [ 'wrong side', player ]; publicVariableServer 'PVDZ_sec_atp'; deleteVehicle _z; };";
local = "_z = _this select 0; if ((_this select 1) and isServer) exitWith { _z call sched_co_deleteVehicle; };";
}; };
class UserActions class UserActions
{ {

View File

@@ -26,7 +26,7 @@ sched_co_deleteVehicle = {
sched_corpses = { sched_corpses = {
private ["_delQtyZ","_delQtyP","_addFlies","_x","_deathTime","_onoff","_delQtyAnimal", "_sound", "_deathPos", "_cpos"]; private ["_delQtyZ","_delQtyP","_addFlies","_x","_deathTime","_onoff","_delQtyAnimal","_sound","_deathPos","_cpos","_animal","_nearPlayer"];
// EVERY 2 MINUTE // EVERY 2 MINUTE
// DELETE UNCONTROLLED ZOMBIES --- PUT FLIES ON FRESH PLAYER CORPSES --- REMOVE OLD FLIES & CORPSES // DELETE UNCONTROLLED ZOMBIES --- PUT FLIES ON FRESH PLAYER CORPSES --- REMOVE OLD FLIES & CORPSES
_delQtyZ = 0; _delQtyZ = 0;
@@ -105,9 +105,13 @@ sched_corpses = {
_delQtyAnimal = 0; _delQtyAnimal = 0;
{ {
if (local _x) then { _animal = _x;
_x call sched_co_deleteVehicle; if (local _animal) then {
_delQtyAnimal = _delQtyAnimal + 1; _nearPlayer = {isPlayer _x} count (_animal nearEntities ["CAManBase",150]);
if (_nearPlayer == 0) then {
_animal call sched_co_deleteVehicle;
_delQtyAnimal = _delQtyAnimal + 1;
};
}; };
} forEach entities "CAAnimalBase"; } forEach entities "CAAnimalBase";