W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-03-01 11:11:52 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pass cursorTarget to maintain_area.sqf

Browse Source 
CursorTarget should always be passed from fn_selfActions, not reacquired
in action scripts. This is to ensure the same object is referenced. Plot
Management maintain_area is called from the dialog button, not
fn_selfactions.
This commit is contained in:
ebaydayz
2016-05-19 13:10:20 -04:00
parent 1a238d1719
commit 914b37a413
7 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_server/compile/server_updateObject.sqf
View File

@@ -69,15 +69,11 @@ _object_inventory = {
if (_object isKindOf "TrapItems") then {
_inventory = [["armed",_object getVariable ["armed",false]]];
} else {
// plotManagement //
if( DZE_plotManagement && (typeOf (_object) == "Plastic_Pole_EP1_DZ") ) then {
_inventory = _object getVariable ["plotfriends", []]; //We're replacing the inventory with UIDs for this item
} else {
// plotManagement //
_inventory = [getWeaponCargo _object, getMagazineCargo _object, getBackpackCargo _object];
// plotManagement //
};
// plotManagement //
};
_previous = str(_object getVariable["lastInventory",[]]);

4
SQF/dayz_server/system/server_monitor.sqf
View File

@@ -176,11 +176,9 @@ if (_status == "ObjectStreamStart") then {
_object setVariable ["ObjectID", _idKey, true];
_object setVariable ["OwnerPUID", _ownerPUID, true];
// plotManagement //
if( DZE_plotManagement && (typeOf (_object) == "Plastic_Pole_EP1_DZ") ) then {
_object setVariable ["plotfriends", _inventory, true];
};
// plotManagement //
dayz_serverIDMonitor set [count dayz_serverIDMonitor,_idKey];
// Fix for leading zero issues on safe codes after restart
@@ -211,9 +209,7 @@ if (_status == "ObjectStreamStart") then {
clearWeaponCargoGlobal _object;
clearMagazineCargoGlobal _object;
clearBackpackCargoGlobal _object;
// plotManagement //
if( (count _inventory > 0) && !(typeOf( _object) == "Plastic_Pole_EP1_DZ") ) then {
// plotManagement //
if (_type in DZE_LockedStorage) then {
_object setVariable ["WeaponCargo",(_inventory select 0),true];
_object setVariable ["MagazineCargo",(_inventory select 1),true];