From 6c1b50174ac6b99744216280150590ad41408d20 Mon Sep 17 00:00:00 2001
From: Raymond <daemitus@gmail.com>
Date: Wed, 10 Nov 2021 20:24:07 -0500
Subject: [PATCH] Pull MBStart into a read method

---
 .../Game/Network/Internal/NetworkHandlers.cs  | 14 +++---------
 .../Structures/MarketBoardCurrentOfferings.cs | 22 +++++++------------
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/Dalamud/Game/Network/Internal/NetworkHandlers.cs b/Dalamud/Game/Network/Internal/NetworkHandlers.cs
index 46b276f38..5dfda2a8b 100644
--- a/Dalamud/Game/Network/Internal/NetworkHandlers.cs
+++ b/Dalamud/Game/Network/Internal/NetworkHandlers.cs
@@ -77,18 +77,10 @@ namespace Dalamud.Game.Network.Internal
             {
                 if (opCode == dataManager.ServerOpCodes["MarketBoardItemRequestStart"])
                 {
-                    var catalogId = (uint)Marshal.ReadInt32(dataPtr);
-                    var amount = Marshal.ReadByte(dataPtr + 0xB);
+                    var data = MarketBoardItemRequest.Read(dataPtr);
+                    this.marketBoardRequests.Add(data);
 
-                    this.marketBoardRequests.Add(new MarketBoardItemRequest
-                    {
-                        CatalogId = catalogId,
-                        AmountToArrive = amount,
-                        Listings = new List<MarketBoardCurrentOfferings.MarketBoardItemListing>(),
-                        History = new List<MarketBoardHistory.MarketBoardHistoryListing>(),
-                    });
-
-                    Log.Verbose($"NEW MB REQUEST START: item#{catalogId} amount#{amount}");
+                    Log.Verbose($"NEW MB REQUEST START: item#{data.CatalogId} amount#{data.AmountToArrive}");
                     return;
                 }
 
diff --git a/Dalamud/Game/Network/Structures/MarketBoardCurrentOfferings.cs b/Dalamud/Game/Network/Structures/MarketBoardCurrentOfferings.cs
index ad19f48c5..364a21454 100644
--- a/Dalamud/Game/Network/Structures/MarketBoardCurrentOfferings.cs
+++ b/Dalamud/Game/Network/Structures/MarketBoardCurrentOfferings.cs
@@ -10,17 +10,14 @@ namespace Dalamud.Game.Network.Structures
     /// </summary>
     public class MarketBoardCurrentOfferings
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MarketBoardCurrentOfferings"/> class.
-        /// </summary>
-        internal MarketBoardCurrentOfferings()
+        private MarketBoardCurrentOfferings()
         {
         }
 
         /// <summary>
         /// Gets the list of individual item listings.
         /// </summary>
-        public List<MarketBoardItemListing> ItemListings { get; internal set; }
+        public List<MarketBoardItemListing> ItemListings { get; } = new();
 
         /// <summary>
         /// Gets the listing end index.
@@ -49,8 +46,6 @@ namespace Dalamud.Game.Network.Structures
             using var stream = new UnmanagedMemoryStream((byte*)dataPtr.ToPointer(), 1544);
             using var reader = new BinaryReader(stream);
 
-            output.ItemListings = new List<MarketBoardItemListing>();
-
             for (var i = 0; i < 10; i++)
             {
                 var listingEntry = new MarketBoardItemListing();
@@ -70,15 +65,14 @@ namespace Dalamud.Game.Network.Structures
                 reader.ReadUInt16(); // durability
                 reader.ReadUInt16(); // spiritbond
 
-                listingEntry.Materia = new List<MarketBoardItemListing.ItemMateria>();
-
                 for (var materiaIndex = 0; materiaIndex < 5; materiaIndex++)
                 {
                     var materiaVal = reader.ReadUInt16();
-
-                    var materiaEntry = new MarketBoardItemListing.ItemMateria();
-                    materiaEntry.MateriaId = (materiaVal & 0xFF0) >> 4;
-                    materiaEntry.Index = materiaVal & 0xF;
+                    var materiaEntry = new MarketBoardItemListing.ItemMateria()
+                    {
+                        MateriaId = (materiaVal & 0xFF0) >> 4,
+                        Index = materiaVal & 0xF,
+                    };
 
                     if (materiaEntry.MateriaId != 0)
                         listingEntry.Materia.Add(materiaEntry);
@@ -154,7 +148,7 @@ namespace Dalamud.Game.Network.Structures
             /// <summary>
             /// Gets the list of materia attached to this item.
             /// </summary>
-            public List<ItemMateria> Materia { get; internal set; }
+            public List<ItemMateria> Materia { get; } = new();
 
             /// <summary>
             /// Gets the amount of attached materia.