Core/Misc: Moved CharacterInfo out of world to separate class

This commit is contained in:
Aokromes committed 2017-10-27 17:52:30 +02:00
1 parent 5373e2bd3b
commit 5e1a7bcfbb
43 files changed
+520 -391

No files matched your search

+6 -5
View File
@@ -30,6 +30,7 @@
#include "AccountMgr.h"
#include "BattlenetAccountMgr.h"
#include "GuildMgr.h"
#include "CharacterCache.h"
bool WorldSession::CanOpenMailBox(ObjectGuid guid)
{
@@ -154,7 +155,7 @@ void WorldSession::HandleSendMail(WorldPacket& recvData)
ObjectGuid receiverGuid;
if (normalizePlayerName(receiverName))
receiverGuid = sWorld->GetCharacterGuidByName(receiverName);
receiverGuid = sCharacterCache->GetCharacterGuidByName(receiverName);
if (!receiverGuid)
{
@@ -212,7 +213,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;
@@ -563,16 +564,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: " UI64FMTD " 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)