Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/AHBot: Fix AHBot bidding and correct logged AH type

Browse Source 
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 2eee1b349f)

Conflicts:
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
This commit is contained in:
jackpoz
2015-02-13 23:39:58 +01:00
committed by Duarte Duarte
parent 6d27bed2e1
commit a7c8caf2ef
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
View File

@@ -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);

2
src/server/game/AuctionHouseBot/AuctionHouseBot.cpp
View File

@@ -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];
}

6
src/server/game/AuctionHouseBot/AuctionHouseBot.h
View File

@@ -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