From 3bba54789b9b6576ebd2ed71b077659dede60423 Mon Sep 17 00:00:00 2001 From: vbawol Date: Fri, 18 Dec 2015 20:23:22 -0600 Subject: [PATCH 1/3] testing if this is the cause for being unable to get target after restart. --- .../@epochhive/addons/a3_epoch_server.pbo | Bin 364245 -> 364251 bytes .../epoch_vehicle/EPOCH_load_storage.sqf | 2 +- .../EPOCH_server_lockStorage.sqf | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo index 499cadad52a61865601b115de033808a4ebde797..5390db93e47855b9647ff9ea2723bdc8a358a6b1 100644 GIT binary patch delta 166 zcmcaQSM2s&u?-diY&`o*!lp=1P85>c93$Yy#KsNe^K%0Enwu{Q9cE+}-Cxo?U1a-o z5yrr8O#1rMwJn$or|W)V=AQoH6*J3ZdsEi!y4*~!{MhyN<4ZC!i>Es(vPw+1UCPKY z-6o336Iobx`|>EJm0@fq<^~34mhE91nShvid)P*n?7Jf7jm7s`5Ve1 za?|ain7k2uiRtl*tgPGDMlr1nV>33fG&eD7kJ-os#LU}cHnL>j70JJ^uy0Z#)4eHE PCDs^Bu#*%%yLUAJN=rMo diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_storage.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_storage.sqf index 29301bab..77d06fb2 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_storage.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_storage.sqf @@ -109,7 +109,7 @@ for "_i" from 1 to _this do { // set locked state of secure storage if ((_arr select 6) != -1) then { _vehicle setVariable["EPOCH_Locked", true, true]; - _vehicle enableSimulationGlobal false; + //_vehicle enableSimulationGlobal false; }; }; }; diff --git a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_lockStorage.sqf b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_lockStorage.sqf index 6ad82430..7aae3270 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_lockStorage.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_lockStorage.sqf @@ -16,11 +16,11 @@ _fnc_lock = { _this setVariable ["EPOCH_Locked", true, true]; // force save on lock if !(_this in EPOCH_saveStorQueue) then { EPOCH_saveStorQueue pushBack _this }; - _this enableSimulationGlobal false; + //_this enableSimulationGlobal false; }; _fnc_unlock = { _this setVariable ["EPOCH_Locked", false, true]; - _this enableSimulationGlobal true; + //_this enableSimulationGlobal true; }; // functions From f196d8461fd014820499b224b7157bc3a929cb12 Mon Sep 17 00:00:00 2001 From: vbawol Date: Sun, 20 Dec 2015 10:21:06 -0600 Subject: [PATCH 2/3] attempt to improve locked gear checks --- .../addons/a3_epoch_server_settings.pbo | Bin 278928 -> 279198 bytes .../compile/missions/EPOCH_spawn_looters.sqf | 4 ++-- .../configs/security/security_checks.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server_settings.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server_settings.pbo index 9a82839161354f0fa2c17f8eb9238fc4deb7e023..121f4354290863900e2eaf197d53f7686dbc78d4 100644 GIT binary patch delta 410 zcmbQxEI6-Ka6*U@if+>WU2r}F?59DYCg|x(+;#6ypNN{S2TYhqBu>!<$ zh?!s+$K;aCvc!^9kPIKtT~Mi7V6beL5M)U)5Sh?)^1^~WKL27>OhrGHh_-g<@fZRC D2gr~@ delta 138 zcmbQ&DmbB8a6*XE!T5qO7X}7~Fe*%c$Ip@sqyhz4l37hPt!u5P?-gK)-L59Y dl42kd)IUM?VEX$G*Ul{d?h93)vp-5k0{|-AEC~Pr diff --git a/Sources/epoch_code/compile/missions/EPOCH_spawn_looters.sqf b/Sources/epoch_code/compile/missions/EPOCH_spawn_looters.sqf index 0e768b13..1e54ffae 100644 --- a/Sources/epoch_code/compile/missions/EPOCH_spawn_looters.sqf +++ b/Sources/epoch_code/compile/missions/EPOCH_spawn_looters.sqf @@ -1,9 +1,9 @@ private["_unit"]; -for "_i" from 0 to 4 step 1 do { +for "_i" from 0 to 4 step 1 do { _unit = createGroup RESISTANCE createUnit ["Epoch_Female_F", getPos player, [], 400, "CAN_COLLIDE"]; - _unit addBackPack "B_Kitbag_Base"; + _unit addBackPack "B_FieldPack_blk"; _unit addWeapon "Hatchet"; _unit addMagazine "hatchet_swing"; {_unit disableAI _x}count["TARGET","AUTOTARGET","FSM"]; diff --git a/Sources/epoch_server_settings/configs/security/security_checks.h b/Sources/epoch_server_settings/configs/security/security_checks.h index c3b44d88..702e7779 100644 --- a/Sources/epoch_server_settings/configs/security/security_checks.h +++ b/Sources/epoch_server_settings/configs/security/security_checks.h @@ -74,7 +74,7 @@ class CfgSecConf checks[] = {"Fired","InventoryClosed","InventoryOpened","Killed","HandleDamage","HandleHeal","Dammaged","Hit","HitPart"}; Fired = "_this call EPOCH_fnc_playerFired;"; InventoryClosed = "if !(EPOCH_arr_interactedObjs isEqualTo[]) then {EPOCH_arr_interactedObjs remoteExec['EPOCH_server_save_vehicles', 2]; EPOCH_arr_interactedObjs = [];};"; - InventoryOpened = "_this spawn EPOCH_initUI;_container = _this select 1; _lockedNear = false;if (_container isKindOf 'GroundWeaponHolder') then {{if (locked _x in [2, 3] || _x getVariable['EPOCH_Locked', false]) exitWith {_lockedNear = true}} forEach (player nearSupplies 5);};(locked _container in [2, 3] || _container getVariable['EPOCH_Locked', false] || _lockedNear)"; + InventoryOpened = "_this spawn EPOCH_initUI;_container = _this select 1;_lockedNear = false;if (_container isKindOf 'GroundWeaponHolder') then {{if (locked _x in [2, 3] ||_x getVariable['EPOCH_Locked', false]) exitWith {_lockedNear = true}} forEach (player nearSupplies 10);};if (locked _container in [2, 3] || _container getVariable['EPOCH_Locked', false] || _lockedNear) then {[] spawn {disableSerialization;waitUntil {!isNull findDisplay 602};_display = findDisplay 602;_ctrl_cargo = _display displayCtrl 6401;_ctrl_ground = _display displayCtrl 6321;_ctrl_cargo ctrlEnable false;ctrlSetFocus _ctrl_ground;ctrlActivate _ctrl_ground;};};"; Killed = "_this call EPOCH_fnc_playerDeath;"; HandleDamage = ""; HandleHeal = ""; From ad4cb8e41b209ec40bf76862bb39e31ea67525cc Mon Sep 17 00:00:00 2001 From: vbawol Date: Sun, 20 Dec 2015 10:41:36 -0600 Subject: [PATCH 3/3] changelogs --- Changelogs/0.3.6.0.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Changelogs/0.3.6.0.txt b/Changelogs/0.3.6.0.txt index 54eb8d42..d4f13b7a 100644 --- a/Changelogs/0.3.6.0.txt +++ b/Changelogs/0.3.6.0.txt @@ -19,3 +19,6 @@ [Changed] Magazines now spawn with a random ammo count. [Changed] Disable simulation of locked storage devices. This also prevents removal of items until device is unlocked/re-simulated. [Info] Removed old .bikey and added new one for 0360. + +**Server Build 025** +[Fixed] New workaround for inventoryOpened and locked storage protection.