From f30582cc9f58556037497fc98c14337277feb8df Mon Sep 17 00:00:00 2001 From: "DESKTOP-UH65DCE\\MusTanG" Date: Wed, 30 Aug 2017 14:30:27 -0500 Subject: [PATCH] Function name change and fix be filter --- Server_Install_Pack/sc/battleye/remoteexec.txt | 2 +- .../gui/scripts/groupTemp/EPOCH_tempGroup_BtnInvite.sqf | 2 +- Sources/epoch_config/Configs/CfgRemoteExec.hpp | 2 +- ...itePlayerTemp.sqf => EPOCH_server_invitePlayerTempGroup.sqf} | 2 +- Sources/epoch_server/config.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename Sources/epoch_server/compile/epoch_grouptemp/{EPOCH_server_invitePlayerTemp.sqf => EPOCH_server_invitePlayerTempGroup.sqf} (88%) diff --git a/Server_Install_Pack/sc/battleye/remoteexec.txt b/Server_Install_Pack/sc/battleye/remoteexec.txt index c44a7974..528a35aa 100644 --- a/Server_Install_Pack/sc/battleye/remoteexec.txt +++ b/Server_Install_Pack/sc/battleye/remoteexec.txt @@ -1 +1 @@ -5 "" !="bis_fnc_execvm \[\[.+\],\"initPlayerServer.sqf\"]" !="bis_fnc_effectkilled(airdestruction|secondaries) \[.+\]" !="epoch_server_checkplayer \[[A-Z]{1} [A-Za-z]{4,10} [0-9]{1,3}-[0-9]{1,3}:[0-9]{1,3}( \(.+\)|) REMOTE\,[0-9]{1,3}]" !="epoch_server_(save(_vehicles|building)|(lock|pack)Storage|(upgrade|remove|paint|maint)build) \[.+\]" !="epoch_server_((load|respawn|dead|invite|revive|teleport)Player(Temp)|(upgrade|updateplayer|create|delete)(Temp|)Group) \[.+\]" !="epoch_server_(deadplayerdetonate|triggerantagonist|playersetvariable|missioncomms|make(marker|SP)|removemarker) \[.+\]" !="epoch_server_(knockDownTree|mineRocks|lootAnimal|handle_(say3d|switchmove|sapperObjs)) \[.+\]" !="epoch_server_((repair|fill|lock)Vehicle|(loot|fill)Container|(store|take)Crypto|make(NPC|)Trade) \[.+\]" !="epoch_server_(paycrypto|tradeRequest|equippeditem|packJack|create(object|AirDrop)|airDropCrate|destroytrash|unpackBackpack) \[.+\]" !="epoch_(localcleanup|fnc_saveplayer|client_bitePlayer|serverlootobject|fnc_updateplayerstats) \[.+\]" !="cup_fnc_handletow \[.+\]" !="bis_fnc_reviveinitaddplayer \[.+\]" +5 "" !="bis_fnc_execvm \[\[.+\],\"initPlayerServer.sqf\"]" !="bis_fnc_effectkilled(airdestruction|secondaries) \[.+\]" !="epoch_server_checkplayer \[[A-Z]{1} [A-Za-z]{4,10} [0-9]{1,3}-[0-9]{1,3}:[0-9]{1,3}( \(.+\)|) REMOTE\,[0-9]{1,3}]" !="epoch_server_(save(_vehicles|building)|(lock|pack)Storage|(upgrade|remove|paint|maint)build) \[.+\]" !="epoch_server_((load|respawn|dead|invite|revive|teleport)Player) \[.+\]" !="epoch_server_((upgrade|updateplayer|inviteplayer|create|delete)(Temp|)Group) \[.+\]" !="epoch_server_(deadplayerdetonate|triggerantagonist|playersetvariable|missioncomms|make(marker|SP)|removemarker) \[.+\]" !="epoch_server_(knockDownTree|mineRocks|lootAnimal|handle_(say3d|switchmove|sapperObjs)) \[.+\]" !="epoch_server_((repair|fill|lock)Vehicle|(loot|fill)Container|(store|take)Crypto|make(NPC|)Trade) \[.+\]" !="epoch_server_(paycrypto|tradeRequest|equippeditem|packJack|create(object|AirDrop)|airDropCrate|destroytrash|unpackBackpack) \[.+\]" !="epoch_(localcleanup|fnc_saveplayer|client_bitePlayer|serverlootobject|fnc_updateplayerstats) \[.+\]" !="cup_fnc_handletow \[.+\]" !="bis_fnc_reviveinitaddplayer \[.+\]" diff --git a/Sources/epoch_code/gui/scripts/groupTemp/EPOCH_tempGroup_BtnInvite.sqf b/Sources/epoch_code/gui/scripts/groupTemp/EPOCH_tempGroup_BtnInvite.sqf index 2a3cf0b0..9ac7c09e 100644 --- a/Sources/epoch_code/gui/scripts/groupTemp/EPOCH_tempGroup_BtnInvite.sqf +++ b/Sources/epoch_code/gui/scripts/groupTemp/EPOCH_tempGroup_BtnInvite.sqf @@ -47,7 +47,7 @@ if (_playerUID == Epoch_my_tempGroupUID || {_x select 0 == _playerUID}count (_mo params ["_playerUID","_txt","_groupName"]; _ret = [_txt,"Epoch Temp Group Menu",true,true] call BIS_fnc_GUImessage; if (_ret) then { - [_playerUID,Epoch_my_tempGroupUID,_groupName,player,Epoch_personalToken] remoteExec ["EPOCH_server_invitePlayerTemp",2]; + [_playerUID,Epoch_my_tempGroupUID,_groupName,player,Epoch_personalToken] remoteExec ["EPOCH_server_invitePlayerTempGroup",2]; }; }; }; diff --git a/Sources/epoch_config/Configs/CfgRemoteExec.hpp b/Sources/epoch_config/Configs/CfgRemoteExec.hpp index 143592fa..f3b66253 100644 --- a/Sources/epoch_config/Configs/CfgRemoteExec.hpp +++ b/Sources/epoch_config/Configs/CfgRemoteExec.hpp @@ -321,7 +321,7 @@ class CfgRemoteExec allowedTargets = 2; jip = 0; }; - class EPOCH_server_invitePlayerTemp + class EPOCH_server_invitePlayerTempGroup { allowedTargets = 2; jip = 0; diff --git a/Sources/epoch_server/compile/epoch_grouptemp/EPOCH_server_invitePlayerTemp.sqf b/Sources/epoch_server/compile/epoch_grouptemp/EPOCH_server_invitePlayerTempGroup.sqf similarity index 88% rename from Sources/epoch_server/compile/epoch_grouptemp/EPOCH_server_invitePlayerTemp.sqf rename to Sources/epoch_server/compile/epoch_grouptemp/EPOCH_server_invitePlayerTempGroup.sqf index 2639e02e..624d1526 100644 --- a/Sources/epoch_server/compile/epoch_grouptemp/EPOCH_server_invitePlayerTemp.sqf +++ b/Sources/epoch_server/compile/epoch_grouptemp/EPOCH_server_invitePlayerTempGroup.sqf @@ -10,7 +10,7 @@ Arma Public License Share Alike (APL-SA) - https://www.bistudio.com/community/licenses/arma-public-license-share-alike Github: - https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_server/compile/epoch_grouptemp/EPOCH_server_inviteTempPlayer.sqf + https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_server/compile/epoch_grouptemp/EPOCH_server_invitePlayerTempGroup.sqf */ params ["_playerUID","_var1","_var2","_player",["_token","",[""]]]; if !([_player, _token] call EPOCH_server_getPToken) exitWith{}; diff --git a/Sources/epoch_server/config.cpp b/Sources/epoch_server/config.cpp index 4aefbf34..27ec0c30 100644 --- a/Sources/epoch_server/config.cpp +++ b/Sources/epoch_server/config.cpp @@ -32,7 +32,7 @@ class CfgServerFunctions class server_updatePlayerTempGroup {}; class server_createTempGroup {}; class server_deleteTempGroup {}; - class server_invitePlayerTemp {}; + class server_invitePlayerTempGroup {}; }; class epoch_bases { class swapBuilding {};