Fix some bugs due to recent additions and certain options (#864)

TrinityCore · Oct 9, 2024 · 548db4a · 548db4a
1 parent cc61891
commit 548db4a
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/WowPacketParser/Parsing/Parsers/UpdateHandler.cs b/WowPacketParser/Parsing/Parsers/UpdateHandler.cs
@@ -3104,7 +3104,7 @@ public static void HandleDestroyObject(Packet packet)
             update.Destroyed.Add(new DestroyedObject()
             {
                 Guid = guid,
-                Text = packet.Writer.ToString()
+                Text = packet.Writer?.ToString() ?? ""
             });
         }
 

diff --git a/WowPacketParser/Store/Objects/UpdateFields/LegacyImplementation/UpdateFieldExtensions.cs b/WowPacketParser/Store/Objects/UpdateFields/LegacyImplementation/UpdateFieldExtensions.cs
@@ -118,7 +118,10 @@ public static TK[] GetArray<T, TK>(this Dictionary<int, UpdateField> dict, T fir
             for (var i = 0; i < count; i++)
             {
                 UpdateField uf;
-                if (dict.TryGetValue(Enums.Version.UpdateFields.GetUpdateField(firstUpdateField) + i, out uf))
+                var updateField = Enums.Version.UpdateFields.GetUpdateField(firstUpdateField);
+                if (updateField == -1)
+                    continue;
+                if (dict.TryGetValue(updateField + i, out uf))
                 {
                     switch (type)
                     {

diff --git a/WowPacketParserModule.V5_3_0_16981/Parsers/UpdateHandler.cs b/WowPacketParserModule.V5_3_0_16981/Parsers/UpdateHandler.cs
@@ -873,7 +873,7 @@ public static void HandleDestroyObject(Packet packet)
             update.Destroyed.Add(new DestroyedObject()
             {
                 Guid = destroyed,
-                Text = packet.Writer.ToString()
+                Text = packet.Writer?.ToString() ?? ""
             });
         }
     }

diff --git a/WowPacketParserModule.V5_4_0_17359/Parsers/UpdateHandler.cs b/WowPacketParserModule.V5_4_0_17359/Parsers/UpdateHandler.cs
@@ -883,7 +883,7 @@ public static void HandleDestroyObject(Packet packet)
             update.Destroyed.Add(new DestroyedObject()
             {
                 Guid = destroyed,
-                Text = packet.Writer.ToString()
+                Text = packet.Writer?.ToString() ?? ""
             });
         }
     }

diff --git a/WowPacketParserModule.V5_4_2_17658/Parsers/UpdateHandler.cs b/WowPacketParserModule.V5_4_2_17658/Parsers/UpdateHandler.cs
@@ -918,7 +918,7 @@ public static void HandleDestroyObject(Packet packet)
             update.Destroyed.Add(new DestroyedObject()
             {
                 Guid = destroyed,
-                Text = packet.Writer.ToString()
+                Text = packet.Writer?.ToString() ?? ""
             });
         }
 

diff --git a/WowPacketParserModule.V5_4_7_17898/Parsers/UpdateHandler.cs b/WowPacketParserModule.V5_4_7_17898/Parsers/UpdateHandler.cs
@@ -37,7 +37,7 @@ public static void HandleDestroyObject(Packet packet)
             update.Destroyed.Add(new DestroyedObject()
             {
                 Guid = destroyed,
-                Text = packet.Writer.ToString()
+                Text = packet.Writer?.ToString() ?? ""
             });
         }
 

diff --git a/WowPacketParserModule.V5_4_8_18291/Parsers/UpdateHandler.cs b/WowPacketParserModule.V5_4_8_18291/Parsers/UpdateHandler.cs
@@ -37,7 +37,7 @@ public static void HandleDestroyObject(Packet packet)
             update.Destroyed.Add(new DestroyedObject()
             {
                 Guid = destroyed,
-                Text = packet.Writer.ToString()
+                Text = packet.Writer?.ToString() ?? ""
             });
         }