Core/Battle.net:

* Changed packet structures to mirror client names
* Simplified ToString Building
* Removed deprecated structures

World: Cleaned up duplicate realm info 'realm' and 'realmHandle' variables (realmHandle was removed, that data is fully contained in realm)

1 files changed, 10 insertions, 2 deletions

diff --git a/src/server/bnetserver/Server/ModuleManager.cpp b/src/server/bnetserver/Server/ModuleManager.cpp
index 3b525eae094..04d21c191a2 100644
--- a/src/server/bnetserver/Server/ModuleManager.cpp
+++ b/src/server/bnetserver/Server/ModuleManager.cpp
@@ -33,8 +33,8 @@ void Battlenet::ModuleManager::Load()
         {
             Field* fields = result->Fetch();
             ModuleInfo* module = new ModuleInfo();
-            module->Type = fields[2].GetString();
-            HexStrToByteArray(fields[0].GetString(), module->ModuleId);
+            module->Handle.Type = fields[2].GetString();
+            HexStrToByteArray(fields[0].GetString(), module->Handle.ModuleId);
             std::string data = fields[4].GetString();
             module->DataSize = data.length() / 2;
             if (module->DataSize)
@@ -56,3 +56,11 @@ Battlenet::ModuleInfo* Battlenet::ModuleManager::CreateModule(std::string const&
 
     return new ModuleInfo(*_modules.at(key));
 }
+
+std::string Battlenet::ModuleInfo::ToString() const
+{
+    std::ostringstream stream;
+    stream << "Battlenet::ModuleInput" << std::endl;
+    APPEND_FIELD(stream, Handle);
+    return stream.str();
+}