mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2025-12-18 01:30:26 +03:00
Legacy UID
This commit is contained in:
@@ -4,7 +4,7 @@ _playerName = _this select 1;
|
||||
_playerObj = nil;
|
||||
_playerPos = [];
|
||||
{
|
||||
if ((getPlayerUID _x) == _playerUID) exitWith {_playerObj = _x;};
|
||||
if ((GetPlayerUIDOld _x) == _playerUID) exitWith {_playerObj = _x;};
|
||||
} count playableUnits;
|
||||
|
||||
if (isNil "_playerObj") then {
|
||||
@@ -18,7 +18,7 @@ if (isNil "_playerObj") exitWith {
|
||||
diag_log format["%1: nil player object, _this:%2", __FILE__, _this];
|
||||
};
|
||||
|
||||
diag_log format["get: %1 (%2), sent: %3 (%4)",typeName (getPlayerUID _playerObj), getPlayerUID _playerObj, typeName _playerUID, _playerUID];
|
||||
diag_log format["get: %1 (%2), sent: %3 (%4)",typeName (GetPlayerUIDOld _playerObj), GetPlayerUIDOld _playerObj, typeName _playerUID, _playerUID];
|
||||
|
||||
if (!isNull _playerObj) then {
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ _isInfected = 0;
|
||||
_model = "";
|
||||
|
||||
if (_playerID == "") then {
|
||||
_playerID = getPlayerUID _playerObj;
|
||||
_playerID = GetPlayerUIDOld _playerObj;
|
||||
};
|
||||
|
||||
if ((_playerID == "") || (isNil "_playerID")) exitWith {
|
||||
|
||||
@@ -4,7 +4,7 @@ private ["_characterID","_playerObj","_playerID","_dummy","_worldspace","_state"
|
||||
|
||||
_characterID = _this select 0;
|
||||
_playerObj = _this select 1;
|
||||
_playerID = getPlayerUID _playerObj;
|
||||
_playerID = GetPlayerUIDOld _playerObj;
|
||||
|
||||
if (isNull _playerObj) exitWith {
|
||||
diag_log ("SETUP INIT FAILED: Exiting, player object null: " + str(_playerObj));
|
||||
@@ -15,7 +15,7 @@ if (isNull _playerObj) exitWith {
|
||||
_playerObj addMPEventHandler ["MPHit", {_this spawn fnc_plyrHit;}];
|
||||
|
||||
if (_playerID == "") then {
|
||||
_playerID = getPlayerUID _playerObj;
|
||||
_playerID = GetPlayerUIDOld _playerObj;
|
||||
};
|
||||
|
||||
if (_playerID == "") exitWith {
|
||||
@@ -23,7 +23,7 @@ if (_playerID == "") exitWith {
|
||||
};
|
||||
|
||||
private["_dummy"];
|
||||
_dummy = getPlayerUID _playerObj;
|
||||
_dummy = GetPlayerUIDOld _playerObj;
|
||||
if ( _playerID != _dummy ) then {
|
||||
diag_log format["DEBUG: _playerID miscompare with UID! _playerID:%1",_playerID];
|
||||
_playerID = _dummy;
|
||||
|
||||
@@ -6,7 +6,7 @@ _worldspace = _this select 2;
|
||||
_class = _this select 3;
|
||||
_obj = _this select 4;
|
||||
_activatingplayer = _this select 5;
|
||||
_activatingplayerUID = (getPlayerUID _activatingplayer);
|
||||
_activatingplayerUID = (GetPlayerUIDOld _activatingplayer);
|
||||
|
||||
_proceed = false;
|
||||
|
||||
|
||||
@@ -12,9 +12,9 @@ _price = format ["%2x %1",_currency,_qty];
|
||||
_name = if (alive _player) then { name _player; } else { "Dead Player"; };
|
||||
|
||||
if (_buyorsell == 0) then { //Buy
|
||||
diag_log format["EPOCH SERVERTRADE: Player: %1 (%2) bought a %3 in/at %4 for %5", _name, (getPlayerUID _player), _classname, _traderCity, _price];
|
||||
diag_log format["EPOCH SERVERTRADE: Player: %1 (%2) bought a %3 in/at %4 for %5", _name, (GetPlayerUIDOld _player), _classname, _traderCity, _price];
|
||||
} else { //SELL
|
||||
diag_log format["EPOCH SERVERTRADE: Player: %1 (%2) sold a %3 in/at %4 for %5",_name, (getPlayerUID _player), _classname, _traderCity, _price];
|
||||
diag_log format["EPOCH SERVERTRADE: Player: %1 (%2) sold a %3 in/at %4 for %5",_name, (GetPlayerUIDOld _player), _classname, _traderCity, _price];
|
||||
};
|
||||
|
||||
if (DZE_ConfigTrader) then {
|
||||
|
||||
@@ -126,9 +126,9 @@ _object_killed = {
|
||||
_objID = _object getVariable['ObjectID','0'];
|
||||
_objUID = _object getVariable['ObjectUID','0'];
|
||||
_worldSpace = getPosATL _object;
|
||||
if (getPlayerUID _killer != "") then {
|
||||
if (GetPlayerUIDOld _killer != "") then {
|
||||
_name = if (alive _killer) then { name _killer; } else { format["OBJECT %1", _killer]; };
|
||||
diag_log format["Vehicle killed: Vehicle %1 (TYPE: %2), CharacterID: %3, ObjectID: %4, ObjectUID: %5, Position: %6, Killer: %7 (UID: %8)", _object, (typeOf _object), _charID, _objID, _objUID, _worldSpace, _name, (getPlayerUID _killer)];
|
||||
diag_log format["Vehicle killed: Vehicle %1 (TYPE: %2), CharacterID: %3, ObjectID: %4, ObjectUID: %5, Position: %6, Killer: %7 (UID: %8)", _object, (typeOf _object), _charID, _objID, _objUID, _worldSpace, _name, (GetPlayerUIDOld _killer)];
|
||||
} else {
|
||||
diag_log format["Vehicle killed: Vehicle %1 (TYPE: %2), CharacterID: %3, ObjectID: %4, ObjectUID: %5, Position: %6", _object, (typeOf _object), _charID, _objID, _objUID, _worldSpace];
|
||||
};
|
||||
|
||||
@@ -914,6 +914,6 @@ server_logUnlockLockEvent = {
|
||||
[_obj, "gear"] call server_updateObject;
|
||||
_statusText = "LOCKED";
|
||||
};
|
||||
diag_log format["SAFE %5: ID:%1 UID:%2 BY %3(%4)", _objectID, _objectUID, (name _player), (getPlayerUID _player), _statusText];
|
||||
diag_log format["SAFE %5: ID:%1 UID:%2 BY %3(%4)", _objectID, _objectUID, (name _player), (GetPlayerUIDOld _player), _statusText];
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user