diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-12-18 23:24:54 +0000 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-12-18 23:25:31 +0000 |
| commit | 28dffbee11024c1abc82a29a3fef655d9262904b (patch) | |
| tree | 49604f0741fe9c6fa1c0a564f2f6c6bd42af33d8 /src/server/game/AuctionHouse/AuctionHouseMgr.cpp | |
| parent | 90857739dcb8cf1f4d5cd74464453e4be702c948 (diff) | |
Core/AuctionHouse: Partially revert 3cf260068809 to keep compatibility with the "AHBot patch"
Note: Trinity needs/wants an auction house bot in the core but for that to happen AHBot needs to be rewritten (possibly using Mango's implementation as a base)
Diffstat (limited to 'src/server/game/AuctionHouse/AuctionHouseMgr.cpp')
| -rw-r--r-- | src/server/game/AuctionHouse/AuctionHouseMgr.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index 206e4e4bb04..161c4a578ce 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -411,7 +411,7 @@ void AuctionHouseObject::AddAuction(AuctionEntry* auction) sScriptMgr->OnAuctionAdd(this, auction); } -bool AuctionHouseObject::RemoveAuction(AuctionEntry* auction) +bool AuctionHouseObject::RemoveAuction(AuctionEntry* auction, uint32 /*itemEntry*/) { bool wasInMap = AuctionsMap.erase(auction->Id) ? true : false; @@ -467,12 +467,14 @@ void AuctionHouseObject::Update() sScriptMgr->OnAuctionSuccessful(this, auction); } + uint32 itemEntry = auction->itemEntry; + ///- In any case clear the auction auction->DeleteFromDB(trans); CharacterDatabase.CommitTransaction(trans); sAuctionMgr->RemoveAItem(auction->itemGUIDLow); - RemoveAuction(auction); + RemoveAuction(auction, itemEntry); } while (result->NextRow()); } |
