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

Fix mistake from Plot for Life addition

Browse Source
This commit is contained in:
icomrade
2016-05-03 12:53:48 -04:00
parent c2ce8aaf8b
commit f8b3ba2105
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SQF/dayz_code/compile/player_lockVault.sqf
View File

@@ -28,15 +28,17 @@ uiSleep 5;
_playerNear = _obj call dze_isnearest_player; _playerNear = _obj call dze_isnearest_player;
if (_playerNear) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_11" call dayz_rollingMessages;}; if (_playerNear) exitWith {DZE_ActionInProgress = false; localize "str_epoch_player_11" call dayz_rollingMessages;};
_ownerID = _obj getVariable["CharacterID","0"];
_charID = _ownerID;
_objectID = _obj getVariable["ObjectID","0"]; _objectID = _obj getVariable["ObjectID","0"];
_objectUID = _obj getVariable["ObjectUID","0"]; _objectUID = _obj getVariable["ObjectUID","0"];
_ComboMatch = (_ownerID == dayz_combination);
_ownerID = _obj getVariable["CharacterID","0"];
if (DZE_plotforLife) then { if (DZE_plotforLife) then {
_combination = _obj getVariable["characterID","0"];
_ownerID = _obj getVariable["ownerPUID","0"]; _ownerID = _obj getVariable["ownerPUID","0"];
_ComboMatch = (_combination == dayz_combination);
}; };
if(!_ComboMatch && (_ownerID != dayz_playerUID)) exitWith {DZE_ActionInProgress = false; s_player_lockvault = -1; format[localize "str_epoch_player_115",_text] call dayz_rollingMessages; };
if((_ownerID != dayz_combination) && (_ownerID != dayz_playerUID)) exitWith {DZE_ActionInProgress = false; s_player_lockvault = -1; format[localize "str_epoch_player_115",_text] call dayz_rollingMessages; };
_alreadyPacking = _obj getVariable["packing",0]; _alreadyPacking = _obj getVariable["packing",0];
if (_alreadyPacking == 1) exitWith {DZE_ActionInProgress = false; s_player_lockvault = -1; format[localize "str_epoch_player_116",_text] call dayz_rollingMessages;}; if (_alreadyPacking == 1) exitWith {DZE_ActionInProgress = false; s_player_lockvault = -1; format[localize "str_epoch_player_116",_text] call dayz_rollingMessages;};
@@ -58,7 +60,7 @@ if (!isNull _obj) then {
_holder setPosATL _pos; _holder setPosATL _pos;
player reveal _holder; player reveal _holder;
_holder setVariable["CharacterID",_ownerID,true]; _holder setVariable["CharacterID",_charID,true];
_holder setVariable["ObjectID",_objectID,true]; _holder setVariable["ObjectID",_objectID,true];
_holder setVariable["ObjectUID",_objectUID,true]; _holder setVariable["ObjectUID",_objectUID,true];
_holder setVariable ["OEMPos", _pos, true]; _holder setVariable ["OEMPos", _pos, true];