Core/AuctionHouse: After taking a break at the start of patch 8.3 auction house is now back in business.
Port From (https://github.com/TrinityCore/TrinityCore/commit/aced88b09bd918b0ed17b6c5e8a6048788600d9d)
This commit is contained in:
@@ -90,7 +90,15 @@ namespace Game.Mails
|
||||
m_receiver = receiver;
|
||||
m_receiver_lowguid = receiver_lowguid;
|
||||
|
||||
// ASSERT(!receiver || receiver.GetGUID().GetCounter() == receiver_lowguid);
|
||||
Cypher.Assert(!receiver || receiver.GetGUID().GetCounter() == receiver_lowguid);
|
||||
}
|
||||
|
||||
public MailReceiver(Player receiver, ObjectGuid receiverGuid)
|
||||
{
|
||||
m_receiver = receiver;
|
||||
m_receiver_lowguid = receiverGuid.GetCounter();
|
||||
|
||||
Cypher.Assert(!receiver || receiver.GetGUID() == receiverGuid);
|
||||
}
|
||||
|
||||
public Player GetPlayer() { return m_receiver; }
|
||||
@@ -140,10 +148,11 @@ namespace Game.Mails
|
||||
m_senderId = (uint)sender.EventId;
|
||||
m_stationery = MailStationery.Default;
|
||||
}
|
||||
public MailSender(AuctionEntry sender)
|
||||
|
||||
public MailSender(AuctionHouseObject sender)
|
||||
{
|
||||
m_messageType = MailMessageType.Auction;
|
||||
m_senderId = sender.GetHouseId();
|
||||
m_senderId = sender.GetAuctionHouseId();
|
||||
m_stationery = MailStationery.Auction;
|
||||
}
|
||||
|
||||
|
||||
@@ -137,7 +137,7 @@ namespace Game.Mails
|
||||
public void SendMailTo(SQLTransaction trans, MailReceiver receiver, MailSender sender, MailCheckMask checkMask = MailCheckMask.None, uint deliver_delay = 0)
|
||||
{
|
||||
Player pReceiver = receiver.GetPlayer(); // can be NULL
|
||||
Player pSender = Global.ObjAccessor.FindPlayer(ObjectGuid.Create(HighGuid.Player, sender.GetSenderId()));
|
||||
Player pSender = sender.GetMailMessageType() == MailMessageType.Normal ? Global.ObjAccessor.FindPlayer(ObjectGuid.Create(HighGuid.Player, sender.GetSenderId())) : null;
|
||||
|
||||
if (pReceiver != null)
|
||||
PrepareItems(pReceiver, trans); // generate mail template items
|
||||
|
||||
Reference in New Issue
Block a user