aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Server/Packets
diff options
context:
space:
mode:
authorxinef1 <w.szyszko2@gmail.com>2017-02-05 23:14:19 +0100
committerShauren <shauren.trinity@gmail.com>2019-07-21 21:06:54 +0200
commitad4e63bae145ae49b584ab2fc621660430cec0d3 (patch)
tree403c1e9348047f49b80fa719567259c388629318 /src/server/game/Server/Packets
parent241e79f434bdd520fb11dbc12b93ab41a7b39dd2 (diff)
Core/Misc: Moved CharacterInfo out of world to separate class
Closes #19030 (cherrypicked from 59ce3d6c9bd82d55cbfa505bb945b71cab21a12f)
Diffstat (limited to 'src/server/game/Server/Packets')
-rw-r--r--src/server/game/Server/Packets/QueryPackets.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/Server/Packets/QueryPackets.cpp b/src/server/game/Server/Packets/QueryPackets.cpp
index 8c4ba6f1746..6433b62d2ea 100644
--- a/src/server/game/Server/Packets/QueryPackets.cpp
+++ b/src/server/game/Server/Packets/QueryPackets.cpp
@@ -17,6 +17,7 @@
#include "QueryPackets.h"
#include "BattlenetAccountMgr.h"
+#include "CharacterCache.h"
#include "ObjectMgr.h"
#include "Player.h"
#include "World.h"
@@ -121,7 +122,7 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Query::PlayerGuidLookupHi
bool WorldPackets::Query::PlayerGuidLookupData::Initialize(ObjectGuid const& guid, Player const* player /*= nullptr*/)
{
- CharacterInfo const* characterInfo = sWorld->GetCharacterInfo(guid);
+ CharacterCacheEntry const* characterInfo = sCharacterCache->GetCharacterCacheByGuid(guid);
if (!characterInfo)
return false;
@@ -142,7 +143,7 @@ bool WorldPackets::Query::PlayerGuidLookupData::Initialize(ObjectGuid const& gui
}
else
{
- uint32 accountId = ObjectMgr::GetPlayerAccountIdByGUID(guid);
+ uint32 accountId = sCharacterCache->GetCharacterAccountIdByGuid(guid);
uint32 bnetAccountId = ::Battlenet::AccountMgr::GetIdByGameAccount(accountId);
AccountID = ObjectGuid::Create<HighGuid::WowAccount>(accountId);