From e9958bc5d8ad43db9202d9b309d944d3147d833e Mon Sep 17 00:00:00 2001 From: vbawol Date: Wed, 6 Jul 2016 23:56:48 -0500 Subject: [PATCH] add god mode enabled variable flag for #525 --- Server_Install_Pack/sc/BattlEye/setvariable.txt | 2 +- Sources/epoch_server/init/server_securityfunctions.sqf | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Server_Install_Pack/sc/BattlEye/setvariable.txt b/Server_Install_Pack/sc/BattlEye/setvariable.txt index 350d97e5..3443ada5 100644 --- a/Server_Install_Pack/sc/BattlEye/setvariable.txt +++ b/Server_Install_Pack/sc/BattlEye/setvariable.txt @@ -1 +1 @@ -5 "" !=(Offer|Accept|BUILD_SLOT|TRADE_ACTIVE|last_targeter|epoch_(antagobj|antagBomb)) !="bis_fnc_objectvar_var" !="bis_fnc_selectrespawntemplate_respawned" +5 "" !=(Offer|Accept|BUILD_SLOT|TRADE_ACTIVE|last_targeter|epoch_(antagobj|antagBomb|gm_enabled)) !="bis_fnc_objectvar_var" !="bis_fnc_selectrespawntemplate_respawned" diff --git a/Sources/epoch_server/init/server_securityfunctions.sqf b/Sources/epoch_server/init/server_securityfunctions.sqf index 18aaf9ba..e070a7e6 100644 --- a/Sources/epoch_server/init/server_securityfunctions.sqf +++ b/Sources/epoch_server/init/server_securityfunctions.sqf @@ -1422,6 +1422,7 @@ _skn_admincode = compileFinal (" "+_skn_tg_godMode+" = !"+_skn_tg_godMode+"; if ("+_skn_tg_godMode+") then { ['God Mode',2] call "+_skn_adminLog_PVC+"; + player setVariable ['EPOCH_gm_enabled',true,true]; waitUntil { player setBleedingRemaining 0; player setOxygenRemaining 1; @@ -1434,6 +1435,7 @@ _skn_admincode = compileFinal (" !"+_skn_tg_godMode+" }; player allowDamage true; + player setVariable ['EPOCH_gm_enabled',false,true]; } else { ['God Mode',1] call "+_skn_adminLog_PVC+"; }