mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2025-12-15 04:23:13 +03:00
1.0.2.35 DEV
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
private ["_object","_myGroup","_id","_playerID","_playerName","_characterID","_playerIDtoarray","_timeout"];
|
||||
private ["_invehicle","_isplayernearby","_object","_myGroup","_id","_playerID","_playerName","_characterID","_playerIDtoarray","_timeout"];
|
||||
_playerID = _this select 0;
|
||||
_playerName = _this select 1;
|
||||
_object = call compile format["player%1",_playerID];
|
||||
@@ -8,8 +8,11 @@ _timeout = _object getVariable["combattimeout",0];
|
||||
_playerIDtoarray = [];
|
||||
_playerIDtoarray = toArray _playerID;
|
||||
|
||||
_invehicle = false;
|
||||
|
||||
if (vehicle _object != _object) then {
|
||||
_object action ["eject", vehicle _object];
|
||||
_invehicle = true;
|
||||
};
|
||||
|
||||
if (59 in _playerIDtoarray) exitWith { };
|
||||
@@ -36,7 +39,8 @@ if (!isNull _object) then {
|
||||
{ [_x,"gear"] call server_updateObject } foreach
|
||||
(nearestObjects [getPosATL _object, dayz_updateObjects, 10]);
|
||||
if (alive _object) then {
|
||||
[_object,(magazines _object),true,true] call server_playerSync;
|
||||
_isplayernearby = (!_invehicle and ({isPlayer _x} count (_object nearEntities ["AllVehicles", 6]) > 1));
|
||||
[_object,(magazines _object),true,true,_isplayernearby] call server_playerSync;
|
||||
_myGroup = group _object;
|
||||
deleteVehicle _object;
|
||||
deleteGroup _myGroup;
|
||||
|
||||
@@ -1,10 +1,15 @@
|
||||
private ["_character","_magazines","_force","_characterID","_charPos","_isInVehicle","_timeSince","_humanity","_debug","_distance","_isNewMed","_isNewPos","_isNewGear","_playerPos","_playerGear","_playerBackp","_medical","_distanceFoot","_lastPos","_backpack","_kills","_killsB","_killsH","_headShots","_lastTime","_timeGross","_timeLeft","_currentWpn","_currentAnim","_config","_onLadder","_isTerminal","_currentModel","_modelChk","_muzzles","_temp","_currentState","_array","_key","_pos","_forceGear"];
|
||||
private ["_empty","_playerwasNearby","_character","_magazines","_force","_characterID","_charPos","_isInVehicle","_timeSince","_humanity","_debug","_distance","_isNewMed","_isNewPos","_isNewGear","_playerPos","_playerGear","_playerBackp","_medical","_distanceFoot","_lastPos","_backpack","_kills","_killsB","_killsH","_headShots","_lastTime","_timeGross","_timeLeft","_currentWpn","_currentAnim","_config","_onLadder","_isTerminal","_currentModel","_modelChk","_muzzles","_temp","_currentState","_array","_key","_pos","_forceGear"];
|
||||
|
||||
_character = _this select 0;
|
||||
_magazines = _this select 1;
|
||||
//_force = _this select 2;
|
||||
_forceGear = _this select 3;
|
||||
_force = true;
|
||||
_playerwasNearby = false;
|
||||
|
||||
if ((count _this) > 4) then {
|
||||
_playerwasNearby = _this select 4;
|
||||
};
|
||||
|
||||
if (isNull _character) exitWith {
|
||||
diag_log ("Player is Null FAILED: Exiting, player sync: " + str(_character));
|
||||
@@ -79,7 +84,12 @@ if (_characterID != "0") then {
|
||||
_playerGear = [weapons _character,_magazines];
|
||||
//diag_log ("playerGear: " +str(_playerGear));
|
||||
_backpack = unitBackpack _character;
|
||||
_playerBackp = [typeOf _backpack,getWeaponCargo _backpack,getMagazineCargo _backpack];
|
||||
if(_playerwasNearby) then {
|
||||
_empty = [[],[]];
|
||||
_playerBackp = [typeOf _backpack,_empty,_empty];
|
||||
} else {
|
||||
_playerBackp = [typeOf _backpack,getWeaponCargo _backpack,getMagazineCargo _backpack];
|
||||
};
|
||||
};
|
||||
if (_isNewMed or _force) then {
|
||||
//diag_log ("medical..."); sleep 0.05;
|
||||
|
||||
Reference in New Issue
Block a user