From 85a25613549e50c9cee37f817c3ebbbca7eeb96f Mon Sep 17 00:00:00 2001 From: vbawol Date: Mon, 30 Nov 2015 20:37:48 -0600 Subject: [PATCH 1/7] temp fix: test blocking ground weapon holder access nearby locked objects --- .../addons/a3_epoch_server_settings.pbo | Bin 274216 -> 274451 bytes .../configs/security/security_checks.h | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) 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 7537248545bf83e0806f77dfb3eb47b8fdf2672b..84220853fbd2a93f66e2c5f47c12b87b3c6a0806 100644 GIT binary patch delta 397 zcmZ2+Phj!`fe9f>qO7rDE({C|$@zI{ndy4T1qDD30sy5qmOW==;{YlvliZxlRK>_< zX=rL_WZL|gx&1LSBM>uff6UBW^s7D|Xhun5W?pKMf~`V)Nk(R|LUC$NYI2E!p|wJM zPJVKBYKmWKB1kqZF{e1yIx|f{14&b6v3F)(ihr7dx_eQ6X->Oiap2jaGLJ@OSo@KK~!H0KY;FP#MD4+t>eNPBjoYw>ful*H)pOl~N^?TOTo@P_lJoP@GSl^v3krZ71OQ5JEPKw#rd}Ts)-AC)nW>7A z&DhM?(%hi=F?0K4W=0@p+WwfCx#*XacWL#a*2YWrb1?( yLbQ>Nf^n=uO$~ Date: Wed, 2 Dec 2015 11:52:23 -0600 Subject: [PATCH 2/7] restore this method --- .../epoch_server_settings/configs/security/security_checks.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Sources/epoch_server_settings/configs/security/security_checks.h b/Sources/epoch_server_settings/configs/security/security_checks.h index 0046a5b0..9cb07d80 100644 --- a/Sources/epoch_server_settings/configs/security/security_checks.h +++ b/Sources/epoch_server_settings/configs/security/security_checks.h @@ -64,7 +64,8 @@ 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; (locked (_this select 1) in [2, 3] || (_this select 1) getVariable['EPOCH_Locked', false])"; + // 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)"; Killed = "_this call EPOCH_fnc_playerDeath;"; HandleDamage = ""; HandleHeal = ""; From ec558c5b669f0c57b00dade5901c821070405dc7 Mon Sep 17 00:00:00 2001 From: vbawol Date: Wed, 2 Dec 2015 11:57:02 -0600 Subject: [PATCH 3/7] add disable simulation to locked storage actually also removes ability to remove items while disabled --- .../epoch_server/compile/epoch_vehicle/EPOCH_load_storage.sqf | 3 ++- .../compile/epoch_vehicle/EPOCH_server_lockStorage.sqf | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) 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 b920a5ee..29301bab 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_storage.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_storage.sqf @@ -72,7 +72,7 @@ for "_i" from 1 to _this do { }; // temp set damage to mark for maint - _vehicle setDamage 0.99; + _vehicle setDamage 0.01; _vehicle setposATL _location; @@ -109,6 +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; }; }; }; 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 7b5f5ae0..6ad82430 100644 --- a/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_lockStorage.sqf +++ b/Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_lockStorage.sqf @@ -16,9 +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; }; _fnc_unlock = { _this setVariable ["EPOCH_Locked", false, true]; + _this enableSimulationGlobal true; }; // functions From 285391f3809909eddb1d74b08a18a6857cdd3534 Mon Sep 17 00:00:00 2001 From: vbawol Date: Wed, 2 Dec 2015 11:59:20 -0600 Subject: [PATCH 4/7] Add player objects to remains collector, this should allow for proper corpse cleanup. --- .../compile/epoch_player/EPOCH_server_loadPlayer.sqf | 3 ++- .../compile/epoch_player/EPOCH_server_revivePlayer.sqf | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf index a472d5d6..9216b479 100644 --- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf +++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf @@ -123,9 +123,10 @@ if (typename _this == "ARRAY") then { }; _newPlyr = _group createUnit[_class, _location, [], 0, "CAN_COLLIDE"]; - if !(isNull _newPlyr) then { + addToRemainsCollector[_newPlyr]; + //diag_log format ["DEBUG Created New Player: %1", _newPlyr]; { _newPlyr disableAI _x; diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_revivePlayer.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_revivePlayer.sqf index 02fc8441..b1f619ab 100644 --- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_revivePlayer.sqf +++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_revivePlayer.sqf @@ -90,6 +90,8 @@ if (!local _plyr) then { _newPlyr = _group createUnit[_class, _location, [], 0, "CAN_COLLIDE"]; + addToRemainsCollector[_newPlyr]; + _newPlyr allowDammage false; { _newPlyr disableAI _x; From 060d22dab6c5aa54747685dcb2a1e5832044000c Mon Sep 17 00:00:00 2001 From: vbawol Date: Wed, 2 Dec 2015 12:00:25 -0600 Subject: [PATCH 5/7] revert changes --- Changelogs/0.3.5.0.txt | 6 ++++++ .../configs/security/security_checks.h | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Changelogs/0.3.5.0.txt b/Changelogs/0.3.5.0.txt index 5b58d904..9f125497 100644 --- a/Changelogs/0.3.5.0.txt +++ b/Changelogs/0.3.5.0.txt @@ -32,3 +32,9 @@ [Fixed] EPOCH_fnc_returnConfigEntry and V2 functions did not use defaults properly. [Info] Server pack Tools folder now contains InstalEpoch.cmd that is an updated version of the command line download Epoch client files download script for steam workshop. [Info] Removed old .bikey and added new one for 0350. + +Build 052-055 +[Fixed] Typo in server side AH event handler code and repacked a3_server_settings.pbo. +[Fixed] Storage was incorrectly set to set damage to 99% instead of 1% to temp force maintenance option after restart. +[Fixed] Add player objects to remains collector, this should allow for proper corpse cleanup. +[Changed] Disable simulation of locked storage devices. This also prevents removal of items until device is unlocked/re-simulated. diff --git a/Sources/epoch_server_settings/configs/security/security_checks.h b/Sources/epoch_server_settings/configs/security/security_checks.h index 9cb07d80..0046a5b0 100644 --- a/Sources/epoch_server_settings/configs/security/security_checks.h +++ b/Sources/epoch_server_settings/configs/security/security_checks.h @@ -64,8 +64,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; (locked (_this select 1) in [2, 3] || (_this select 1) getVariable['EPOCH_Locked', false])"; - // 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 5);};(locked _container in [2, 3] || _container getVariable['EPOCH_Locked', false] || _lockedNear)"; Killed = "_this call EPOCH_fnc_playerDeath;"; HandleDamage = ""; HandleHeal = ""; From 290fe7ccbaeaaef516e1ad5300cc33028759d8c0 Mon Sep 17 00:00:00 2001 From: vbawol Date: Wed, 2 Dec 2015 12:00:37 -0600 Subject: [PATCH 6/7] fixed extra comma --- Sources/epoch_config/Configs/CfgEpochClient/Esseker.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/epoch_config/Configs/CfgEpochClient/Esseker.hpp b/Sources/epoch_config/Configs/CfgEpochClient/Esseker.hpp index cec38ad5..3814ecbd 100644 --- a/Sources/epoch_config/Configs/CfgEpochClient/Esseker.hpp +++ b/Sources/epoch_config/Configs/CfgEpochClient/Esseker.hpp @@ -51,7 +51,7 @@ class Esseker { "water_source_f.p3d", "kasna_new.p3d" }; - // main config + // main config TrashClasses[] = { "Trash", "TrashSmall", "TrashVehicle", "PumpkinPatch", "TrashFood" }; TrashSmall[] = { @@ -60,7 +60,7 @@ class Esseker { }; PumpkinPatch[] = { "p_pumpkin_summer.p3d", - "pumpkin.p3d", + "pumpkin.p3d" }; TrashFood[] = { }; @@ -158,4 +158,4 @@ class Esseker { "uaz_wrecked.p3d", "ural_wrecked.p3d" }; -}; \ No newline at end of file +}; From 86d0a2fae76d00361eba7a33a979420ca58d7f93 Mon Sep 17 00:00:00 2001 From: vbawol Date: Wed, 2 Dec 2015 12:00:42 -0600 Subject: [PATCH 7/7] repacked --- .../@epochhive/addons/a3_epoch_server.pbo | Bin 362028 -> 362227 bytes .../addons/a3_epoch_server_settings.pbo | Bin 274451 -> 274451 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo index 63698c000f64aa926003bc63ee98782c070b36d4..26d47042ace7938c83e1700887f9a026e35bb8c8 100644 GIT binary patch delta 298 zcmZ3}BlfvhY{M5uHV%pSu+M^%A2KU%mSrkrWBV>1A6CsZnUOc93$Yy#K!3z8^+BE~#K$hlpei*c3K^t1CB#o3`swjVcPY&pSXU^u<-FQdrxJ}D-N?UjES?O3Ou(PuK6 z{x_V7f3koH>-O_ZOfUV|IO9t)GK;65&Sg}Xz9W#y112y-f>n0=zd)uHVeFO$riRAm p=Iv`&Faa_1_O&ZmvhRvSU!LvW{qd0L&$knW?Wb2{y{}-N2>{ijYaIXp delta 222 zcmV<403rYLjTWqo7O?aI2DbW5R`U^);R7SH9RhI%2696jReK7P0SG3ux(GD^2C}|G zR-`MF(F!D&U%dhrlP?OKlMo980hqJU3TOoeQLQOfWE+!V5+1W$5Jmz9%0nquzzCCJ z5-FGO1Oo@N*b=+}13-UNvzHW2^_Sua0V$Uj1OgP6p8*E9O$q_3Dz_gs0eZ*+IXSnR z{Q+tPmzVRyy%vE({C|$@zI{ndy4T1qDD30sy5qmOW==*3^mLoWNAW$Zlz1 xYG!0;(fpXX{V_8m5HkTW^Y+KgEHXMGUB$Y#eYb^=)EqO7rDE({C|$@zI{ndy4T1qDD30sy5qmOW===3tH8oWNAW$Zlb2 xXliI=+WeTg{V_8m5HkTW^Y+KgEHXMG=Qigq?%FD}v-0W_K@0Ep%8T*!G5`_RAm0E0