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

Remove FNC_getPlayerUID

Browse Source 
It's been over two years since it was added. All servers should be
updated to steam ID by now.
This commit is contained in:
ebaydayz
2016-08-23 15:40:26 -04:00
parent 7d27b5c0b1
commit 134a614255
30 changed files with 76 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_server/compile/server_handleSafeGear.sqf
View File

@@ -19,7 +19,7 @@ _ownerID = _obj getVariable ["ownerPUID","0"];
if (isNull _player) then {diag_log "ERROR: server_handleSafeGear called with Null player object";};
_clientID = owner _player;
_puid = [_player] call FNC_GetPlayerUID;
_puid = getPlayerUID _player;
_statusText = switch (_status) do {
case 0: {"UNLOCKED"};

10
SQF/dayz_server/compile/server_onPlayerDisconnect.sqf
View File

@@ -1,4 +1,4 @@
private ["_playerObj","_myGroup","_playerUID","_playerPos","_playerName","_puid","_timeout","_message"];
private ["_playerObj","_myGroup","_playerUID","_playerPos","_playerName","_message"];
_playerUID = _this select 0;
_playerName = _this select 1;
@@ -7,8 +7,7 @@ _playerPos = [];
//Lets search all playerable units looking for the objects that matches our playerUID
{
_puid = [_x] call FNC_GetPlayerUID;
if (_puid == _playerUID) exitWith { _playerObj = _x; _playerPos = getPosATL _playerObj;};
if ((getPlayerUID _x) == _playerUID) exitWith { _playerObj = _x; _playerPos = getPosATL _playerObj;};
} forEach playableUnits;
//If for some reason the playerOBj does not exist lets exit the disconnect system.
@@ -16,8 +15,7 @@ if (isNil "_playerObj") exitWith {
diag_log format["%1: nil player object, _this:%2", __FILE__, _this];
};
_puid = [_playerObj] call FNC_GetPlayerUID;
//diag_log format["get: %1 (%2), sent: %3 (%4)",typeName _puid, _puid, typeName _playerUID, _playerUID];
//diag_log format["get: %1 (%2), sent: %3 (%4)",typeName (getPlayerUID _playerObj), getPlayerUID _playerObj, typeName _playerUID, _playerUID];
//If the the playerObj exists lets run all sync systems
@@ -32,7 +30,7 @@ diag_log format["INFO - Player: %3(UID:%1/CID:%2) as (%4), logged off at %5%6",
getPlayerUID _playerObj,
_characterID,
_playerObj call fa_plr2str,
typeOf _playerObj,
typeOf _playerObj,
(getPosATL _playerObj) call fa_coor2str,
if ((_lastDamage > 5 AND (_lastDamage < 30)) AND ((alive _playerObj) AND (_playerObj distance (getMarkerpos "respawn_west") >= 2000))) then {" while in combat ("+str(_lastDamage)+" seconds left)"} else {""}
];

2
SQF/dayz_server/compile/server_playerLogin.sqf
View File

@@ -23,7 +23,7 @@ _playerCoins = 0;
_BankCoins = 0;
if (_playerID == "") then {
_playerID = [_playerObj] call FNC_GetPlayerUID;
_playerID = getPlayerUID _playerObj;
};
if ((_playerID == "") or (isNil "_playerID")) exitWith {

6
SQF/dayz_server/compile/server_playerSetup.sqf
View File

@@ -3,7 +3,7 @@ private ["_characterID","_playerObj","_playerID","_dummy","_worldspace","_state"
_characterID = _this select 0;
_playerObj = _this select 1;
_spawnSelection = _this select 3;
_playerID = [_playerObj] call FNC_GetPlayerUID;
_playerID = getPlayerUID _playerObj;
#include "\z\addons\dayz_server\compile\server_toggle_debug.hpp"
@@ -12,7 +12,7 @@ if (isNull _playerObj) exitWith {
};
if (_playerID == "") then {
_playerID = [_playerObj] call FNC_GetPlayerUID;
_playerID = getPlayerUID _playerObj;
};
if (_playerID == "") exitWith {
@@ -20,7 +20,7 @@ if (_playerID == "") exitWith {
};
private "_dummy";
_dummy = [_playerObj] call FNC_GetPlayerUID;
_dummy = getPlayerUID _playerObj;
if (_playerID != _dummy) then {
diag_log format["DEBUG: _playerID miscompare with UID! _playerID:%1",_playerID];
_playerID = _dummy;

12
SQF/dayz_server/compile/server_swapObject.sqf
View File

@@ -1,16 +1,12 @@
private ["_activatingplayerUID","_class","_uid","_charID","_object","_worldspace","_key","_allowed","_obj","_inv","_objectID","_objectUID","_proceed","_activatingplayer"];
private ["_class","_uid","_charID","_object","_worldspace","_key","_allowed","_obj","_inv","_objectID","_objectUID","_proceed","_activatingplayer"];
//[dayz_characterID,_tent,[_dir,_location],"TentStorage"]
_charID = _this select 0;
_object = _this select 1;
_worldspace = _this select 2;
_class = _this select 3;
_obj = _this select 4;
_activatingplayer = _this select 5;
_activatingplayerUID = [_activatingplayer] call FNC_GetPlayerUID;
_inv = [];
if ((count _this) > 6) then {
_inv = _this select 6;
};
_activatingplayer = _this select 5;
_inv = if (count _this > 6) then {_this select 6} else {[]};
_proceed = false;
_objectID = "0";
@@ -45,7 +41,7 @@ if (!_allowed || !_proceed) exitWith {
if(!isNull(_object)) then {
deleteVehicle _object;
};
diag_log ("Invalid object swap by playerUID:"+ str(_activatingplayerUID));
diag_log ("Invalid object swap by playerUID:" + (getPlayerUID _activatingplayer));
};
// Publish variables

2
SQF/dayz_server/compile/server_tradeObject.sqf
View File

@@ -22,7 +22,7 @@ _clientID = owner _player;
if (typeName _price == "SCALAR") then { _price = format ["%1x%2",_price,_currency]; } else { _price = format ["%1",_price]; };
_name = if (alive _player) then { name _player; } else { "Dead Player"; };
_PUID = [_player] call FNC_GetPlayerUID;
_PUID = getPlayerUID _player;
if (_buyorsell == 0) then { //Buy
diag_log format["%8: %9: %1 (%2) bought %6 x %3 into %7 at %4 for %5", _name, _PUID, _classname, _traderCity, _price, _quantity,_container,localize "STR_EPOCH_PLAYER_289",localize "STR_EPOCH_PLAYER"];