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, 4 insertions, 2 deletions

diff --git a/src/server/bnetserver/Packets/PacketsBase.cpp b/src/server/bnetserver/Packets/PacketsBase.cpp
index da76865ff8d..87e24c96e3e 100644
--- a/src/server/bnetserver/Packets/PacketsBase.cpp
+++ b/src/server/bnetserver/Packets/PacketsBase.cpp
@@ -22,13 +22,15 @@
 std::string Battlenet::PacketHeader::ToString() const
 {
     std::ostringstream stream;
-    stream << "Battlenet::PacketHeader opcode: " << Opcode << ", channel: " << Channel;
+    stream << "Battlenet::PacketHeader" << std::endl;
+    APPEND_FIELD(stream, Command);
+    APPEND_FIELD(stream, Channel);
     return stream.str();
 }
 
 Battlenet::ServerPacket::ServerPacket(PacketHeader const& header) : Packet(header, *new BitStream())
 {
-    _stream.Write(header.Opcode, 6);
+    _stream.Write(header.Command, 6);
     _stream.Write(1, 1);
     _stream.Write(header.Channel, 4);
 }