diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2019-03-12 15:53:22 +0100 |
|---|---|---|
| committer | Giacomo Pozzoni <giacomopoz@gmail.com> | 2019-03-12 16:09:45 +0100 |
| commit | fa8c0dd534723a573268ccd8bb40c0846cb35936 (patch) | |
| tree | 81a685fbc3a1720476f5127032a79263e401ea98 /src/server/game/AuctionHouseBot | |
| parent | f6d3a5b9b98b8f422588694a2197adacea62c675 (diff) | |
Revert "Core/AuctionHouse: use DisableMgr to disable specific items (#19289)"
This reverts commit f6d3a5b9b98b8f422588694a2197adacea62c675.
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, 2 insertions, 10 deletions
diff --git a/src/server/game/AuctionHouseBot/AuctionHouseBot.cpp b/src/server/game/AuctionHouseBot/AuctionHouseBot.cpp index 4a852ad3cd6..c3c9d33d44c 100644 --- a/src/server/game/AuctionHouseBot/AuctionHouseBot.cpp +++ b/src/server/game/AuctionHouseBot/AuctionHouseBot.cpp @@ -147,12 +147,7 @@ void AuctionBotConfig::GetConfigFromFile() SetConfigMax(CONFIG_AHBOT_NEUTRAL_ITEM_AMOUNT_RATIO, "AuctionHouseBot.Neutral.Items.Amount.Ratio", 100, 10000); SetAHBotIncludes(sConfigMgr->GetStringDefault("AuctionHouseBot.forceIncludeItems", "")); - 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); - } + SetAHBotExcludes(sConfigMgr->GetStringDefault("AuctionHouseBot.forceExcludeItems", "")); 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 f0bc80ebbf9..d80a86fc478 100644 --- a/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp +++ b/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp @@ -20,7 +20,6 @@ #include "Containers.h" #include "DatabaseEnv.h" #include "DBCStores.h" -#include "DisableMgr.h" #include "GameTime.h" #include "Item.h" #include "Log.h" @@ -63,6 +62,7 @@ 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,9 +120,6 @@ 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)) { |