From 25ffdbc5ef0859aeaadfa132329a498e86827e68 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 18 Aug 2024 18:59:58 +0200 Subject: Core/Realms: Realmlist refactors * Removed global realm variable from World and use RealmList everywhere * Match auth build key with client version * Restored allowedSecurityLevel checks for realmlist packet building * Restored updating population field, mysteriously removed 15 years ago in f20b25d1c90f608deab28c9957b3b376ab2a0d50 (cherry picked from commit c4b710446d62c95eb8124175203fa5f394912594) # Conflicts: # sql/base/auth_database.sql --- src/server/game/Handlers/QueryHandler.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/server/game/Handlers/QueryHandler.cpp') diff --git a/src/server/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp index 4bcab4d2074..c848cc67c7d 100644 --- a/src/server/game/Handlers/QueryHandler.cpp +++ b/src/server/game/Handlers/QueryHandler.cpp @@ -321,12 +321,13 @@ void WorldSession::HandleQueryRealmName(WorldPackets::Query::QueryRealmName& que WorldPackets::Query::RealmQueryResponse realmQueryResponse; realmQueryResponse.VirtualRealmAddress = queryRealmName.VirtualRealmAddress; - Battlenet::RealmHandle realmHandle(queryRealmName.VirtualRealmAddress); - if (sRealmList->GetRealmNames(realmHandle, &realmQueryResponse.NameInfo.RealmNameActual, &realmQueryResponse.NameInfo.RealmNameNormalized)) + if (std::shared_ptr realm = sRealmList->GetRealm(queryRealmName.VirtualRealmAddress)) { realmQueryResponse.LookupState = RESPONSE_SUCCESS; realmQueryResponse.NameInfo.IsInternalRealm = false; realmQueryResponse.NameInfo.IsLocal = queryRealmName.VirtualRealmAddress == GetVirtualRealmAddress(); + realmQueryResponse.NameInfo.RealmNameActual = realm->Name; + realmQueryResponse.NameInfo.RealmNameNormalized = realm->NormalizedName; } else realmQueryResponse.LookupState = RESPONSE_FAILURE; -- cgit v1.2.3