diff options
| author | xinef1 <w.szyszko2@gmail.com> | 2017-02-05 23:14:19 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-02-05 23:14:19 +0100 |
| commit | 59ce3d6c9bd82d55cbfa505bb945b71cab21a12f (patch) | |
| tree | 11e0f0f2ae3f3baffff0586f785ebbc7b7efd8aa /src/server/game/Mails/Mail.cpp | |
| parent | 3c605ba614c45c4b8f99c12fb49f342c068054a5 (diff) | |
Core/Misc: Moved CharacterInfo out of world to separate class
Closes #19030
Diffstat (limited to 'src/server/game/Mails/Mail.cpp')
| -rw-r--r-- | src/server/game/Mails/Mail.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp index ff7ed74c900..fe642aae1e6 100644 --- a/src/server/game/Mails/Mail.cpp +++ b/src/server/game/Mails/Mail.cpp @@ -26,6 +26,7 @@ #include "Item.h" #include "AuctionHouseMgr.h" #include "CalendarMgr.h" +#include "CharacterCache.h" MailSender::MailSender(Object* sender, MailStationery stationery) : m_stationery(stationery) { @@ -141,7 +142,7 @@ void MailDraft::SendReturnToSender(uint32 sender_acc, ObjectGuid::LowType sender uint32 rc_account = 0; if (!receiver) - rc_account = sObjectMgr->GetPlayerAccountIdByGUID(receiverGuid); + rc_account = sCharacterCache->GetCharacterAccountIdByGuid(receiverGuid); if (!receiver && !rc_account) // sender not exist { @@ -180,7 +181,7 @@ void MailDraft::SendReturnToSender(uint32 sender_acc, ObjectGuid::LowType sender void MailDraft::SendMailTo(SQLTransaction& trans, MailReceiver const& receiver, MailSender const& sender, MailCheckMask checked, uint32 deliver_delay) { Player* pReceiver = receiver.GetPlayer(); // can be NULL - Player* pSender = sObjectMgr->GetPlayerByLowGUID(sender.GetSenderId()); + Player* pSender = ObjectAccessor::FindPlayerByLowGUID(sender.GetSenderId()); if (pReceiver) prepareItems(pReceiver, trans); // generate mail template items |