From a81ab040c05f9515c1ce9ade1c0dd68e492fee18 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Tue, 2 Mar 2021 13:39:27 +0300 Subject: [PATCH 1/3] fix for last PR ACE remove https://github.com/azerothcore/azerothcore-wotlk/pull/4608 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 083c918..00ef8ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,4 +8,4 @@ AC_ADD_SCRIPT("${CMAKE_CURRENT_LIST_DIR}/src/cs_anticheat.cpp") AC_ADD_SCRIPT_LOADER("PassiveAnticheat" "${CMAKE_CURRENT_LIST_DIR}/src/loader.h") -CU_ADD_HOOK(AFTER_WORLDSERVER_CMAKE "${CMAKE_CURRENT_LIST_DIR}/src/cmake/after_ws_install.cmake") +AC_ADD_CONFIG_FILE("${CMAKE_CURRENT_LIST_DIR}/conf/Anticheat.conf.dist") From c539465e98415de3b9a8cf615bfcb4ceaadf5fae Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Tue, 2 Mar 2021 13:39:44 +0300 Subject: [PATCH 2/3] Delete after_ws_install.cmake --- src/cmake/after_ws_install.cmake | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 src/cmake/after_ws_install.cmake diff --git a/src/cmake/after_ws_install.cmake b/src/cmake/after_ws_install.cmake deleted file mode 100644 index d36d954..0000000 --- a/src/cmake/after_ws_install.cmake +++ /dev/null @@ -1,15 +0,0 @@ -if( WIN32 ) - if ( MSVC ) - add_custom_command(TARGET worldserver - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_MOD_ANTICHEAT_DIR}/conf/Anticheat.conf.dist" ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/ - ) - elseif ( MINGW ) - add_custom_command(TARGET worldserver - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_MOD_ANTICHEAT_DIR}/conf/Anticheat.conf.dist" ${CMAKE_BINARY_DIR}/bin/ - ) - endif() -endif() - -install(FILES "${CMAKE_MOD_ANTICHEAT_DIR}/conf/Anticheat.conf.dist" DESTINATION ${CONF_DIR}) From c6e05527e864ef87a06bc8c252af622930be139f Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Tue, 2 Mar 2021 13:40:45 +0300 Subject: [PATCH 3/3] Update AnticheatScripts.cpp --- src/AnticheatScripts.cpp | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/AnticheatScripts.cpp b/src/AnticheatScripts.cpp index f54bb15..3ac29e5 100644 --- a/src/AnticheatScripts.cpp +++ b/src/AnticheatScripts.cpp @@ -53,22 +53,6 @@ public: sAnticheatMgr->SavePlayerData(plr); } } - void OnBeforeConfigLoad(bool reload) override - { - /* from skeleton module */ - if (!reload) { - std::string conf_path = _CONF_DIR; - std::string cfg_file = conf_path + "/Anticheat.conf"; - #ifdef WIN32 - cfg_file = "Anticheat.conf"; - #endif // WIN32 - std::string cfg_def_file = cfg_file + ".dist"; - sConfigMgr->LoadMore(cfg_def_file.c_str()); - - sConfigMgr->LoadMore(cfg_file.c_str()); - } - /* end from skeleton module */ - } void OnAfterConfigLoad(bool /* reload */) override // unusued parameter { sLog->outString("AnticheatModule Loaded.");