Duplicate 1_1x_x handler in cata module

TrinityCore · Jan 13, 2025 · 2157d88 · 2157d88
1 parent c7532f1
commit 2157d88
Show file tree

Hide file tree

Showing 2 changed files with 1,155 additions and 22 deletions.
diff --git a/WowPacketParserModule.V4_4_0_54481/Parsers/UpdateHandler.cs b/WowPacketParserModule.V4_4_0_54481/Parsers/UpdateHandler.cs
@@ -62,19 +62,9 @@ public static void HandleUpdateObject(Packet packet)
             var updateObject = packet.Holder.UpdateObject = new();
             uint count;
             uint map;
-            if (ClientVersion.AddedInVersion(ClientBranch.Classic, ClientVersionBuild.V1_15_5_57638))
-            {
-                map = updateObject.MapId = packet.ReadUInt16<MapId>("MapID");
-                count = packet.ReadUInt32("NumObjUpdates");
-            }
-            else
-            {
-                count = packet.ReadUInt32("NumObjUpdates");
-                map = updateObject.MapId = packet.ReadUInt16<MapId>("MapID");
-            }
+            count = packet.ReadUInt32("NumObjUpdates");
+            map = updateObject.MapId = packet.ReadUInt16<MapId>("MapID");
             packet.ResetBitReader();
-            if (ClientVersion.AddedInVersion(ClientBranch.Classic, ClientVersionBuild.V1_15_5_57638))
-                packet.ReadBit("Unknown_11_0_5");
             var hasRemovedObjects = packet.ReadBit("HasRemovedObjects");
             if (hasRemovedObjects)
             {
@@ -118,10 +108,7 @@ public static void HandleUpdateObject(Packet packet)
                             WoWObject obj;
                             Storage.Objects.TryGetValue(guid, out obj);
 
-                            if (ClientVersion.AddedInVersion(ClientBranch.Classic, ClientVersionBuild.V1_15_5_57638))
-                                ReadUpdateObjectBlockFragmented(fieldsData, updateValues, handler, obj, i);
-                            else
-                                ReadUpdateObjectBlock(fieldsData, updateValues, handler, obj, i);
+                            ReadUpdateObjectBlock(fieldsData, updateValues, handler, obj, i);
                         }
                         updateObject.Updated.Add(new UpdateObject{Guid = guid, Values = updateValues, TextStartOffset = partWriter.StartOffset, TextLength = partWriter.Length, Text = partWriter.Text});
                         break;
@@ -131,10 +118,7 @@ public static void HandleUpdateObject(Packet packet)
                     {
                         var createType = type.ToCreateObjectType();
                         var createObject = new CreateObject() { Guid = guid, Values = new(){}, CreateType = createType };
-                        if (ClientVersion.AddedInVersion(ClientBranch.Classic, ClientVersionBuild.V1_15_5_57638))
-                            ReadCreateObjectBlockFragmented(packet, createObject, guid, map, createType, i);
-                        else
-                            ReadCreateObjectBlock(packet, createObject, guid, map, createType, i);
+                        ReadCreateObjectBlock(packet, createObject, guid, map, createType, i);
                         createObject.Text = partWriter.Text;
                         createObject.TextStartOffset = partWriter.StartOffset;
                         createObject.TextLength = partWriter.Length;
@@ -561,8 +545,6 @@ private static MovementInfo ReadMovementUpdateBlock(Packet packet, WowGuid guid,
 
             packet.ResetBitReader();
 
-            if (ClientVersion.AddedInVersion(ClientBranch.Classic, ClientVersionBuild.V1_15_5_57638))
-                packet.ReadBit("HasPositionFragment", index);
             packet.ReadBit("NoBirthAnim", index);
             packet.ReadBit("EnablePortals", index);
             packet.ReadBit("PlayHoverAnim", index);