Core/Packets: Implemented CMSG_QUERY_REALM_NAME and SMSG_REALM_QUERY_RESPONSE

3 files changed, 12 insertions, 1 deletions

diff --git a/src/server/shared/Realm/Realm.cpp b/src/server/shared/Realm/Realm.cpp
index 45e5b445297..2754fa60581 100644
--- a/src/server/shared/Realm/Realm.cpp
+++ b/src/server/shared/Realm/Realm.cpp
@@ -19,6 +19,13 @@
 #include "StringFormat.h"
 #include <boost/asio/ip/address.hpp>
 
+void Realm::SetName(std::string name)
+{
+    Name = name;
+    NormalizedName = std::move(name);
+    NormalizedName.erase(std::remove_if(NormalizedName.begin(), NormalizedName.end(), ::isspace), NormalizedName.end());
+}
+
 boost::asio::ip::address Realm::GetAddressForClient(boost::asio::ip::address const& clientAddr) const
 {
     boost::asio::ip::address realmIp;
diff --git a/src/server/shared/Realm/Realm.h b/src/server/shared/Realm/Realm.h
index 21675fe149b..bde0a47c7df 100644
--- a/src/server/shared/Realm/Realm.h
+++ b/src/server/shared/Realm/Realm.h
@@ -83,12 +83,15 @@ struct TC_SHARED_API Realm
     std::unique_ptr<boost::asio::ip::address> LocalSubnetMask;
     uint16 Port;
     std::string Name;
+    std::string NormalizedName;
     uint8 Type;
     RealmFlags Flags;
     uint8 Timezone;
     AccountTypes AllowedSecurityLevel;
     float PopulationLevel;
 
+    void SetName(std::string name);
+
     boost::asio::ip::address GetAddressForClient(boost::asio::ip::address const& clientAddr) const;
     uint32 GetConfigId() const;
 
diff --git a/src/server/shared/Realm/RealmList.cpp b/src/server/shared/Realm/RealmList.cpp
index 93bb4fc98ff..c579b741d8e 100644
--- a/src/server/shared/Realm/RealmList.cpp
+++ b/src/server/shared/Realm/RealmList.cpp
@@ -71,7 +71,8 @@ void RealmList::UpdateRealm(Battlenet::RealmHandle const& id, uint32 build, std:
 
     realm.Id = id;
     realm.Build = build;
-    realm.Name = name;
+    if (realm.Name != name)
+        realm.SetName(name);
     realm.Type = icon;
     realm.Flags = flag;
     realm.Timezone = timezone;