diff --git a/src/game/AuctionHouseHandler.cpp b/src/game/AuctionHouseHandler.cpp index c57fd93bc..5ea820943 100644 --- a/src/game/AuctionHouseHandler.cpp +++ b/src/game/AuctionHouseHandler.cpp @@ -162,7 +162,7 @@ void WorldSession::SendAuctionOutbiddedMail(AuctionEntry *auction) if (oldBidder || oldBidder_accId) { std::ostringstream msgAuctionOutbiddedSubject; - msgAuctionOutbiddedSubject << auction->itemTemplate << ":0:" << AUCTION_OUTBIDDED << ":0:0"; + msgAuctionOutbiddedSubject << auction->itemTemplate << ":" << auction->itemRandomPropertyId << ":" << AUCTION_OUTBIDDED << ":" << auction->Id << ":" << auction->itemCount; if (oldBidder) oldBidder->GetSession()->SendAuctionBidderNotification(auction); @@ -187,7 +187,7 @@ void WorldSession::SendAuctionCancelledToBidderMail(AuctionEntry* auction) if (bidder || bidder_accId) { std::ostringstream msgAuctionCancelledSubject; - msgAuctionCancelledSubject << auction->itemTemplate << ":0:" << AUCTION_CANCELLED_TO_BIDDER << ":0:0"; + msgAuctionCancelledSubject << auction->itemTemplate << ":" << auction->itemRandomPropertyId << ":" << AUCTION_CANCELLED_TO_BIDDER << ":" << auction->Id << ":" << auction->itemCount; if (bidder) bidder->GetSession()->SendAuctionRemovedNotification(auction); @@ -505,7 +505,7 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recv_data) } // Return the item by mail std::ostringstream msgAuctionCanceledOwner; - msgAuctionCanceledOwner << auction->itemTemplate << ":0:" << AUCTION_CANCELED << ":0:0"; + msgAuctionCanceledOwner << auction->itemTemplate << ":" << auction->itemRandomPropertyId << ":" << AUCTION_CANCELED << ":" << auction->Id << ":" << auction->itemCount; // item will deleted or added to received mail list MailDraft(msgAuctionCanceledOwner.str(), "") // TODO: fix body diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/AuctionHouseMgr.cpp index 727514859..d2ffab508 100644 --- a/src/game/AuctionHouseMgr.cpp +++ b/src/game/AuctionHouseMgr.cpp @@ -138,7 +138,7 @@ void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry *auction) if (bidder || bidder_accId) { std::ostringstream msgAuctionWonSubject; - msgAuctionWonSubject << auction->itemTemplate << ":0:" << AUCTION_WON; + msgAuctionWonSubject << auction->itemTemplate << ":" << auction->itemRandomPropertyId << ":" << AUCTION_WON; std::ostringstream msgAuctionWonBody; msgAuctionWonBody.width(16); @@ -185,7 +185,7 @@ void AuctionHouseMgr::SendAuctionSalePendingMail(AuctionEntry * auction) if (owner || owner_guid && sObjectMgr.GetPlayerAccountIdByGUID(owner_guid)) { std::ostringstream msgAuctionSalePendingSubject; - msgAuctionSalePendingSubject << auction->itemTemplate << ":0:" << AUCTION_SALE_PENDING; + msgAuctionSalePendingSubject << auction->itemTemplate << ":" << auction->itemRandomPropertyId << ":" << AUCTION_SALE_PENDING; std::ostringstream msgAuctionSalePendingBody; uint32 auctionCut = auction->GetAuctionCut(); @@ -219,7 +219,7 @@ void AuctionHouseMgr::SendAuctionSuccessfulMail(AuctionEntry * auction) if (owner || owner_accId) { std::ostringstream msgAuctionSuccessfulSubject; - msgAuctionSuccessfulSubject << auction->itemTemplate << ":0:" << AUCTION_SUCCESSFUL; + msgAuctionSuccessfulSubject << auction->itemTemplate << ":" << auction->itemRandomPropertyId << ":" << AUCTION_SUCCESSFUL; std::ostringstream auctionSuccessfulBody; uint32 auctionCut = auction->GetAuctionCut(); @@ -267,7 +267,7 @@ void AuctionHouseMgr::SendAuctionExpiredMail(AuctionEntry * auction) if (owner || owner_accId) { std::ostringstream subject; - subject << auction->itemTemplate << ":0:" << AUCTION_EXPIRED << ":0:0"; + subject << auction->itemTemplate << ":" << auction->itemRandomPropertyId << ":" << AUCTION_EXPIRED << ":" << auction->Id << ":" << auction->itemCount; if (owner) owner->GetSession()->SendAuctionOwnerNotification(auction); @@ -462,7 +462,7 @@ void AuctionHouseMgr::LoadAuctions() // Attempt send item back to owner std::ostringstream msgAuctionCanceledOwner; - msgAuctionCanceledOwner << auction->itemTemplate << ":0:" << AUCTION_CANCELED << ":0:0"; + msgAuctionCanceledOwner << auction->itemTemplate << ":"<< auction->itemRandomPropertyId << ":" << AUCTION_CANCELED << ":" << auction->Id << ":" << auction->itemCount; if (auction->itemGuidLow) { diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index bb1cc709d..ba5ef0c3e 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11705" + #define REVISION_NR "11706" #endif // __REVISION_NR_H__