1 files changed, 13 insertions, 15 deletions

diff --git a/src/server/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp
index 1f88585b5ae..7be46b4723b 100644
--- a/src/server/game/Handlers/QueryHandler.cpp
+++ b/src/server/game/Handlers/QueryHandler.cpp
@@ -36,35 +36,33 @@
 void WorldSession::SendNameQueryOpcode(ObjectGuid guid)
 {
     Player* player = ObjectAccessor::FindConnectedPlayer(guid);
-    CharacterNameData const* nameData = sWorld->GetCharacterNameData(guid);
+    CharacterInfo const* characterInfo = sWorld->GetCharacterInfo(guid);
 
     WorldPackets::Character::PlayerNameResponse response;
     response.Player = guid;
 
-    if (nameData)
+    if (characterInfo)
     {
-        uint32 accountId = player ? player->GetSession()->GetAccountId() : sObjectMgr->GetPlayerAccountIdByGUID(guid);
+        uint32 accountId = player ? player->GetSession()->GetAccountId() : ObjectMgr::GetPlayerAccountIdByGUID(guid);
         uint32 bnetAccountId = player ? player->GetSession()->GetBattlenetAccountId() : Battlenet::AccountMgr::GetIdByGameAccount(accountId);
 
-        response.Result = 0; // name known
-        response.Data.IsDeleted = false; // TODO: send deletes as well
-        response.Data.AccountID = ObjectGuid::Create<HighGuid::WowAccount>(accountId);
+        response.Result             = RESPONSE_SUCCESS; // name known
+        response.Data.IsDeleted     = characterInfo->IsDeleted;
+        response.Data.AccountID     = ObjectGuid::Create<HighGuid::WowAccount>(accountId);
         response.Data.BnetAccountID = ObjectGuid::Create<HighGuid::BNetAccount>(bnetAccountId);
-        response.Data.Name = nameData->m_name;
+        response.Data.Name          = characterInfo->Name;
         response.Data.VirtualRealmAddress = GetVirtualRealmAddress();
-        response.Data.Race = nameData->m_race;
-        response.Data.Sex = nameData->m_gender;
-        response.Data.ClassID = nameData->m_class;
-        response.Data.Level = nameData->m_level;
+        response.Data.Race          = characterInfo->Race;
+        response.Data.Sex           = characterInfo->Sex;
+        response.Data.ClassID       = characterInfo->Class;
+        response.Data.Level         = characterInfo->Level;
 
         if (DeclinedName const* names = (player ? player->GetDeclinedNames() : nullptr))
-            for (int i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
+            for (uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
                 response.Data.DeclinedNames.name[i] = names->name[i];
     }
     else
-    {
-        response.Result = 1; // name unknown
-    }
+        response.Result = RESPONSE_FAILURE; // name unknown
 
     SendPacket(response.Write());
 }