From cc6dba1376905456062d1ade8adcbaed4f8f484e Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 3 Aug 2023 11:18:11 +0200 Subject: Core/Realms: Minor refactor to realm address storage (remove LocalSubnetMask as it is now unused, db field kept for table structure compatibility with 3.3.5 branch) --- src/server/worldserver/Main.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'src/server/worldserver/Main.cpp') diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index 013b4b0f977..3c3184f4ddc 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -617,18 +617,7 @@ bool LoadRealmInfo() { if (Realm const* realmListRealm = sRealmList->GetRealm(realm.Id)) { - realm.Id = realmListRealm->Id; - realm.Build = realmListRealm->Build; - realm.ExternalAddress = std::make_unique(*realmListRealm->ExternalAddress); - realm.LocalAddress = std::make_unique(*realmListRealm->LocalAddress); - realm.Port = realmListRealm->Port; - realm.Name = realmListRealm->Name; - realm.NormalizedName = realmListRealm->NormalizedName; - realm.Type = realmListRealm->Type; - realm.Flags = realmListRealm->Flags; - realm.Timezone = realmListRealm->Timezone; - realm.AllowedSecurityLevel = realmListRealm->AllowedSecurityLevel; - realm.PopulationLevel = realmListRealm->PopulationLevel; + realm = *realmListRealm; return true; } -- cgit v1.2.3