diff options
Diffstat (limited to 'src/server/game/Handlers/MailHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/MailHandler.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp index 0941074663a..91c3cf01449 100644 --- a/src/server/game/Handlers/MailHandler.cpp +++ b/src/server/game/Handlers/MailHandler.cpp @@ -28,6 +28,7 @@ #include "DBCStores.h" #include "Item.h" #include "AccountMgr.h" +#include "CharacterCache.h" bool WorldSession::CanOpenMailBox(ObjectGuid guid) { @@ -104,7 +105,7 @@ void WorldSession::HandleSendMail(WorldPacket& recvData) ObjectGuid receiverGuid; if (normalizePlayerName(receiverName)) - receiverGuid = sWorld->GetCharacterGuidByName(receiverName); + receiverGuid = sCharacterCache->GetCharacterGuidByName(receiverName); if (!receiverGuid) { @@ -160,7 +161,7 @@ void WorldSession::HandleSendMail(WorldPacket& recvData) } else { - if (CharacterInfo const* characterInfo = sWorld->GetCharacterInfo(receiverGuid)) + if (CharacterCacheEntry const* characterInfo = sCharacterCache->GetCharacterCacheByGuid(receiverGuid)) { receiverTeam = Player::TeamForRace(characterInfo->Race); receiverLevel = characterInfo->Level; @@ -508,16 +509,16 @@ void WorldSession::HandleMailTakeItem(WorldPacket& recvData) else { // can be calculated early - sender_accId = sObjectMgr->GetPlayerAccountIdByGUID(sender_guid); + sender_accId = sCharacterCache->GetCharacterAccountIdByGuid(sender_guid); - if (!sObjectMgr->GetPlayerNameByGUID(sender_guid, sender_name)) + if (!sCharacterCache->GetCharacterNameByGuid(sender_guid, sender_name)) sender_name = sObjectMgr->GetTrinityStringForDBCLocale(LANG_UNKNOWN); } sLog->outCommand(GetAccountId(), "GM %s (Account: %u) receiver mail item: %s (Entry: %u Count: %u) and send COD money: %u to player: %s (Account: %u)", GetPlayerName().c_str(), GetAccountId(), it->GetTemplate()->Name1.c_str(), it->GetEntry(), it->GetCount(), m->COD, sender_name.c_str(), sender_accId); } else if (!receiver) - sender_accId = sObjectMgr->GetPlayerAccountIdByGUID(sender_guid); + sender_accId = sCharacterCache->GetCharacterAccountIdByGuid(sender_guid); // check player existence if (receiver || sender_accId) |