diff options
Diffstat (limited to 'src/server/game/Mails/Mail.cpp')
| -rw-r--r-- | src/server/game/Mails/Mail.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp index 7cf1138d610..7af35a476ff 100644 --- a/src/server/game/Mails/Mail.cpp +++ b/src/server/game/Mails/Mail.cpp @@ -29,7 +29,6 @@ #include "UpdateMask.h" #include "Unit.h" #include "Language.h" -#include "AuctionHouseBot.h" #include "DBCStores.h" #include "BattleGroundMgr.h" #include "Item.h" @@ -395,10 +394,7 @@ void WorldSession::HandleMailReturnToSender(WorldPacket & recv_data) pl->RemoveMItem(itr2->item_guid); } } - if (m->sender == auctionbot.GetAHBplayerGUID()) - draft.AddMoney(m->money).SendReturnToSender(GetAccountId(), m->receiver, auctionbot.GetAHBplayerGUID()); - else - draft.AddMoney(m->money).SendReturnToSender(GetAccountId(), m->receiver, m->sender); + draft.AddMoney(m->money).SendReturnToSender(GetAccountId(), m->receiver, m->sender); } delete m; //we can deallocate old mail @@ -921,13 +917,6 @@ void MailDraft::SendMailTo(MailReceiver const& receiver, MailSender const& sende uint32 mailId = objmgr.GenerateMailID(); - if (receiver.GetPlayerGUIDLow() == auctionbot.GetAHBplayerGUID()) - { - if (sender.GetMailMessageType() == MAIL_AUCTION) // auction mail with items - deleteIncludedItems(true); - return; - } - time_t deliver_time = time(NULL) + deliver_delay; //expire time if COD 3 days, if no COD 30 days, if auction sale pending 1 hour |