diff --git a/conf/mod_congratsonlevel.conf.dist b/conf/mod_congratsonlevel.conf.dist index 7b5483d..393b205 100644 --- a/conf/mod_congratsonlevel.conf.dist +++ b/conf/mod_congratsonlevel.conf.dist @@ -19,12 +19,3 @@ Congrats.Announce = 1 # ID Acore String Message Congrats.Acore.String.ID = 60000 - -# Ignore Playerbots entirely? (1: true | 0: false) -# -# PlayerbotFactory calls Player::GiveLevel() whenever it randomises a bot, which fires -# the same level-changed hook a real ding does. With this off, every bot re-roll past a -# reward level broadcasts to the whole server and hands the bot gold and items. -# Has no effect on a core built without mod-playerbots. - -Congrats.SkipBots = 1 diff --git a/src/mod_congratsonlevel.cpp b/src/mod_congratsonlevel.cpp index 43a4eee..265914e 100644 --- a/src/mod_congratsonlevel.cpp +++ b/src/mod_congratsonlevel.cpp @@ -69,35 +69,15 @@ config file for quick modifications. #include "ScriptMgr.h" #include "WorldSessionMgr.h" -#ifdef MOD_PLAYERBOTS -#include "PlayerbotAI.h" -#include "Playerbots.h" -#endif - struct COL { uint32 acoreMessageId; bool congratsAnnounce, congratsEnable; bool CongratsPerLevelEnable; - bool skipBots; }; COL col; -// On a Playerbots server PlayerbotFactory calls Player::GiveLevel() every time it -// randomises a bot, which fires OnPlayerLevelChanged exactly like a real ding. Left -// unchecked that means a server-wide broadcast and a bag of reward items per bot -// re-roll. Bots are skipped by default; set Congrats.SkipBots = 0 to include them. -static bool IsPlayerbot(Player* player) -{ -#ifdef MOD_PLAYERBOTS - return player && GET_PLAYERBOT_AI(player) != nullptr; -#else - (void)player; - return false; -#endif -} - uint32 giveAward(Player* player) { QueryResult result = WorldDatabase.Query("SELECT * FROM `mod_congrats_on_level_items` WHERE `level`={} AND (`race`={} OR `race`=0) AND (`class`={} OR `class`=0)", player->GetLevel(), player->getRace(), player->getClass()); @@ -142,11 +122,8 @@ public: PLAYERHOOK_ON_LOGIN }) {} - void OnPlayerLogin(Player* player) override + void OnPlayerLogin(Player* player) { - if (col.skipBots && IsPlayerbot(player)) - return; - // Announce Module if (col.congratsAnnounce) ChatHandler(player->GetSession()).SendSysMessage(col.acoreMessageId); @@ -163,9 +140,6 @@ public: // Level Up Rewards void OnPlayerLevelChanged(Player* player, uint8 oldLevel) override { - if (col.skipBots && IsPlayerbot(player)) - return; - // If enabled... if (col.congratsEnable) { @@ -323,7 +297,6 @@ public: col.congratsAnnounce = sConfigMgr->GetOption("Congrats.Announce", 1); col.congratsEnable = sConfigMgr->GetOption("Congrats.Enable", 1); col.CongratsPerLevelEnable = sConfigMgr->GetOption("CongratsPerLevel.Enable", 1); - col.skipBots = sConfigMgr->GetOption("Congrats.SkipBots", 1); } } };