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, 37 insertions, 6 deletions

diff --git a/src/server/bnetserver/Packets/CachePackets.h b/src/server/bnetserver/Packets/CachePackets.h
index 67488101320..aaa9594610f 100644
--- a/src/server/bnetserver/Packets/CachePackets.h
+++ b/src/server/bnetserver/Packets/CachePackets.h
@@ -51,11 +51,40 @@ namespace Battlenet
             std::string ToString() const override;
             void CallHandler(Session* session) override;
 
-            std::string Channel;
-            std::string ItemName;
-            std::string Locale;
-            uint32 Index = 0;
+            enum
+            {
+                BEFORE = 0,
+                AFTER = 1
+            };
+
+            uint32 Token = 0;
+            uint8 MaxItems = 0;
             int32 ReferenceTime = 0;
+            uint8 Direction = BEFORE;
+
+            struct StreamId : public PrintableComponent
+            {
+                enum
+                {
+                    INDEX = 0,
+                    DESCRIPTION = 1
+                };
+
+                int32 Type;
+
+                uint16 Index;
+                struct DescriptionType : public PrintableComponent
+                {
+                    std::string Channel;
+                    std::string ItemName;
+
+                    std::string ToString() const override;
+                } Description;
+
+                std::string ToString() const override;
+            } Stream;
+
+            std::string Locale;
         };
 
         class GetStreamItemsResponse final : public ServerPacket
@@ -70,8 +99,10 @@ namespace Battlenet
             void Write() override;
             std::string ToString() const override;
 
-            uint32 Index = 0;
-            std::vector<ModuleInfo*> Modules;
+            std::vector<ModuleInfo*> Items;
+            uint16 Offset = 0;
+            uint16 TotalNumItems = 1;
+            uint32 Token = 0;
         };
     }
 }