From 2eee1b349f599f92f78c58418d128f386ef3b86d Mon Sep 17 00:00:00 2001 From: jackpoz Date: Fri, 13 Feb 2015 23:39:58 +0100 Subject: 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 --- src/server/game/AuctionHouse/AuctionHouseMgr.cpp | 2 +- src/server/game/AuctionHouseBot/AuctionHouseBot.cpp | 2 +- src/server/game/AuctionHouseBot/AuctionHouseBot.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index ac2ceb78346..e8c91479cc2 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 == 0) + 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 a04e4091778..c0c753100bc 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 -- cgit v1.2.3