diff options
| author | jackpoz <giacomopoz@gmail.com> | 2015-02-13 23:39:58 +0100 |
|---|---|---|
| committer | Duarte Duarte <dnpd.dd@gmail.com> | 2015-02-22 06:21:02 +0000 |
| commit | a7c8caf2ef770a5a60bcf9a404d81cd97c07050f (patch) | |
| tree | ba05d0ebc7bf001cf98ca188142f5497736161dc | |
| parent | 6d27bed2e14aa14909a6e530bbeb812ba4f39dde (diff) | |
Core/AHBot: Fix AHBot bidding and correct logged AH type
Correct AuctionHouseType definition to log the right AH type.
Handle auctions without bidder but with a bid as bought by the AH Bot
Closes #14124
(cherry picked from commit 2eee1b349f599f92f78c58418d128f386ef3b86d)
Conflicts:
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
| -rw-r--r-- | src/server/game/AuctionHouse/AuctionHouseMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/AuctionHouseBot/AuctionHouseBot.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/AuctionHouseBot/AuctionHouseBot.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index e8d85788e3e..f920470cb4b 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -469,7 +469,7 @@ void AuctionHouseObject::Update() continue; ///- Either cancel the auction if there was no bidder - if (!auction->bidder) + if (auction->bidder == 0 && auction->bid == 0) { sAuctionMgr->SendAuctionExpiredMail(auction, trans); sScriptMgr->OnAuctionExpire(this, auction); diff --git a/src/server/game/AuctionHouseBot/AuctionHouseBot.cpp b/src/server/game/AuctionHouseBot/AuctionHouseBot.cpp index b6221d980aa..fd78e933960 100644 --- a/src/server/game/AuctionHouseBot/AuctionHouseBot.cpp +++ b/src/server/game/AuctionHouseBot/AuctionHouseBot.cpp @@ -239,7 +239,7 @@ void AuctionBotConfig::GetConfigFromFile() char const* AuctionBotConfig::GetHouseTypeName(AuctionHouseType houseType) { - static char const* names[MAX_AUCTION_HOUSE_TYPE] = { "Alliance", "Horde", "Neutral" }; + static char const* names[MAX_AUCTION_HOUSE_TYPE] = { "Neutral", "Alliance", "Horde" }; return names[houseType]; } diff --git a/src/server/game/AuctionHouseBot/AuctionHouseBot.h b/src/server/game/AuctionHouseBot/AuctionHouseBot.h index 29460ba13d7..d7570c37d44 100644 --- a/src/server/game/AuctionHouseBot/AuctionHouseBot.h +++ b/src/server/game/AuctionHouseBot/AuctionHouseBot.h @@ -39,9 +39,9 @@ enum AuctionQuality enum AuctionHouseType { - AUCTION_HOUSE_ALLIANCE = 0, - AUCTION_HOUSE_HORDE = 1, - AUCTION_HOUSE_NEUTRAL = 2 + AUCTION_HOUSE_NEUTRAL = 0, + AUCTION_HOUSE_ALLIANCE = 1, + AUCTION_HOUSE_HORDE = 2 }; #define MAX_AUCTION_HOUSE_TYPE 3 |