From e8c671ee6345dab477570da0b995f710847fb604 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Tue, 2 Mar 2021 13:04:41 +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 fb51db5..e653fc4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,4 +4,4 @@ AC_ADD_SCRIPT("${CMAKE_CURRENT_LIST_DIR}/src/mod_moneyforkills.cpp") AC_ADD_SCRIPT_LOADER("MoneyForKills" "${CMAKE_CURRENT_LIST_DIR}/src/loader_moneyforkills.h") -CU_ADD_HOOK(AFTER_WORLDSERVER_CMAKE "${CMAKE_CURRENT_LIST_DIR}/src/cmake/after_ws_install.cmake") \ No newline at end of file +AC_ADD_CONFIG_FILE("${CMAKE_CURRENT_LIST_DIR}/conf/mod_moneyforkills.conf.dist") From d0d410ac761db51350aeaac59f3431271956be65 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Tue, 2 Mar 2021 13:04:57 +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 8e2ee8f..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_MONEYFORKILLS_DIR}/conf/mod_moneyforkills.conf.dist" ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/ - ) - elseif ( MINGW ) - add_custom_command(TARGET worldserver - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_MOD_MONEYFORKILLS_DIR}/conf/mod_moneyforkills.conf.dist" ${CMAKE_BINARY_DIR}/bin/ - ) - endif() -endif() - -install(FILES "${CMAKE_MOD_MONEYFORKILLS_DIR}/conf/mod_moneyforkills.conf.dist" DESTINATION ${CONF_DIR}) \ No newline at end of file From 44decbd057c4e62112b8eb11f63350266fc5e585 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Tue, 2 Mar 2021 13:05:19 +0300 Subject: [PATCH 3/3] Update mod_moneyforkills.cpp --- src/mod_moneyforkills.cpp | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/mod_moneyforkills.cpp b/src/mod_moneyforkills.cpp index fe91769..73be8f7 100644 --- a/src/mod_moneyforkills.cpp +++ b/src/mod_moneyforkills.cpp @@ -380,26 +380,7 @@ public: } }; -class MoneyForKillsWorld : public WorldScript -{ -public: - MoneyForKillsWorld() : WorldScript("MoneyForKillsWorld") { } - - void OnBeforeConfigLoad(bool reload) override - { - if (!reload) { - std::string conf_path = _CONF_DIR; - std::string cfg_file = conf_path + "/mod_moneyforkills.conf"; - - std::string cfg_def_file = cfg_file + ".dist"; - sConfigMgr->LoadMore(cfg_def_file.c_str()); - sConfigMgr->LoadMore(cfg_file.c_str()); - } - } -}; - void AddMoneyForKillsScripts() { new MoneyForKills(); - new MoneyForKillsWorld(); -} \ No newline at end of file +}