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

Fixed incorrect logic in unlock safe code.

Browse Source
This commit is contained in:
vbawol
2013-06-03 12:35:31 -05:00
parent 47faf02560
commit 50b7fa10ab
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dayz_code/compile/player_unlockVault.sqf
View File

@@ -7,12 +7,12 @@ if(TradeInprogress) exitWith { cutText ["Unlock already in progress." , "PLAIN D
TradeInprogress = true; TradeInprogress = true;
// Test cannot lock while another player is nearby // Test cannot lock while another player is nearby
_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1; _playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 6]) > 1;
if(_playerNear) exitWith { TradeInprogress = false; cutText ["Cannot unlock vault while another player is nearby." , "PLAIN DOWN"]; }; if(_playerNear) exitWith { TradeInprogress = false; cutText ["Cannot unlock vault while another player is nearby." , "PLAIN DOWN"]; };
_obj = _this; _obj = _this;
_alreadyPacking = _obj getVariable["packing",0]; _alreadyPacking = _obj getVariable["packing",0];
_claimedBy = _holder getVariable["claimed","0"]; _claimedBy = _obj getVariable["claimed","0"];
{player removeAction _x} forEach s_player_combi;s_player_combi = []; {player removeAction _x} forEach s_player_combi;s_player_combi = [];
s_player_unlockvault = 1; s_player_unlockvault = 1;
@@ -35,7 +35,7 @@ if ((_ownerID == dayz_combination) or (_ownerID == dayz_playerUID)) then {
// Only allow if not already claimed. // Only allow if not already claimed.
if (_claimedBy == "0" or !_playerNear) then { if (_claimedBy == "0" or !_playerNear) then {
// Since item was not claimed proceed with claiming it. // Since item was not claimed proceed with claiming it.
_holder setVariable["claimed",_playerID,true]; _obj setVariable["claimed",_playerID,true];
}; };
_dir = direction _obj; _dir = direction _obj;
@@ -43,9 +43,9 @@ if ((_ownerID == dayz_combination) or (_ownerID == dayz_playerUID)) then {
_objectID = _obj getVariable["ObjectID","0"]; _objectID = _obj getVariable["ObjectID","0"];
_objectUID = _obj getVariable["ObjectUID","0"]; _objectUID = _obj getVariable["ObjectUID","0"];
_claimedBy = _holder getVariable["claimed","0"]; _claimedBy = _obj getVariable["claimed","0"];
if (_claimedBy != _playerID) then { if (_claimedBy == _playerID) then {
if(!isNull _obj and alive _obj) then { if(!isNull _obj and alive _obj) then {