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

Merge commit '799bdc17105c566a705cb93b4f1d1813c23f2ba2' into 4.3.4

Browse Source 
Conflicts:
	sql/updates/world/2014_10_27_00_world.sql
	sql/updates/world/2014_10_27_01_world_335.sql
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
This commit is contained in:
Carbenium
2015-07-21 18:30:05 +02:00
parent 9f1d71a53f 799bdc1710
commit 68fd138476
10 changed files with 73 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/Handlers/AuctionHouseHandler.cpp
View File

@@ -528,9 +528,8 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket& recvData)
auction->DeleteFromDB(trans);
uint32 itemEntry = auction->itemEntry;
sAuctionMgr->RemoveAItem(auction->itemGUIDLow);
auctionHouse->RemoveAuction(auction, itemEntry);
auctionHouse->RemoveAuction(auction);
}
player->SaveInventoryAndGoldToDB(trans);
CharacterDatabase.CommitTransaction(trans);
@@ -606,9 +605,8 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket& recvData)
auction->DeleteFromDB(trans);
CharacterDatabase.CommitTransaction(trans);
uint32 itemEntry = auction->itemEntry;
sAuctionMgr->RemoveAItem(auction->itemGUIDLow);
auctionHouse->RemoveAuction(auction, itemEntry);
auctionHouse->RemoveAuction(auction);
}
//called when player lists his bids