diff options
| author | ForesterDev <11771800+ForesterDev@users.noreply.github.com> | 2019-03-12 12:34:34 +0400 |
|---|---|---|
| committer | Giacomo Pozzoni <giacomopoz@gmail.com> | 2019-03-12 09:34:34 +0100 |
| commit | f6d3a5b9b98b8f422588694a2197adacea62c675 (patch) | |
| tree | 08b2ac7dd9bbfda6bc76488c71c6251bf38935e6 /src/server/game/AuctionHouseBot | |
| parent | 56749580226f7bafe377a357bcbb73b05f5b7f47 (diff) | |
Core/AuctionHouse: use DisableMgr to disable specific items (#19289)
* Core/AuctionHouse: use DisableMgr to disable specific item for AuctionHouse or AuctionHouseBot
Diffstat (limited to 'src/server/game/AuctionHouseBot')
| -rw-r--r-- | src/server/game/AuctionHouseBot/AuctionHouseBot.cpp | 7 | ||||
| -rw-r--r-- | src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/server/game/AuctionHouseBot/AuctionHouseBot.cpp b/src/server/game/AuctionHouseBot/AuctionHouseBot.cpp index c3c9d33d44c..4a852ad3cd6 100644 --- a/src/server/game/AuctionHouseBot/AuctionHouseBot.cpp +++ b/src/server/game/AuctionHouseBot/AuctionHouseBot.cpp @@ -147,7 +147,12 @@ void AuctionBotConfig::GetConfigFromFile() SetConfigMax(CONFIG_AHBOT_NEUTRAL_ITEM_AMOUNT_RATIO, "AuctionHouseBot.Neutral.Items.Amount.Ratio", 100, 10000); SetAHBotIncludes(sConfigMgr->GetStringDefault("AuctionHouseBot.forceIncludeItems", "")); - SetAHBotExcludes(sConfigMgr->GetStringDefault("AuctionHouseBot.forceExcludeItems", "")); + std::string ahBotExcludes = sConfigMgr->GetStringDefault("AuctionHouseBot.forceExcludeItems", ""); + if (!ahBotExcludes.empty()) + { + TC_LOG_WARN("server.loading", "AuctionHouseBot.forceExcludeItems will be deleted soon. Please, use `disables` table instead with `sourceType`=9, `flags`=2 and `entry`=<item id>."); + SetAHBotExcludes(ahBotExcludes); + } SetConfig(CONFIG_AHBOT_BUYER_ALLIANCE_ENABLED, "AuctionHouseBot.Buyer.Alliance.Enabled", false); SetConfig(CONFIG_AHBOT_BUYER_HORDE_ENABLED, "AuctionHouseBot.Buyer.Horde.Enabled", false); diff --git a/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp b/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp index d80a86fc478..f0bc80ebbf9 100644 --- a/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp +++ b/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp @@ -20,6 +20,7 @@ #include "Containers.h" #include "DatabaseEnv.h" #include "DBCStores.h" +#include "DisableMgr.h" #include "GameTime.h" #include "Item.h" #include "Log.h" @@ -62,7 +63,6 @@ bool AuctionBotSeller::Initialize() } TC_LOG_DEBUG("ahbot", "Forced Inclusion %u items", (uint32)includeItems.size()); - TC_LOG_DEBUG("ahbot", "Forced Exclusion %u items", (uint32)excludeItems.size()); TC_LOG_DEBUG("ahbot", "Loading npc vendor items for filter.."); CreatureTemplateContainer const& creatures = sObjectMgr->GetCreatureTemplates(); @@ -120,6 +120,9 @@ bool AuctionBotSeller::Initialize() if (excludeItems.count(itemId)) continue; + if (DisableMgr::IsDisabledFor(DISABLE_TYPE_ITEM, itemId, nullptr, ITEM_DISABLE_AUCTIONHOUSE_BOT)) + continue; + // forced include filter if (includeItems.count(itemId)) { |