Fixed parsing 2.5.3 MovementInfo and add MovementFlag3

Oroxzy · Feb 23, 2022 · 14e3537 · 14e3537
1 parent b7749f8
commit 14e3537
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/WowPacketParser/Enums/MovementFlag3.cs b/WowPacketParser/Enums/MovementFlag3.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace WowPacketParser.Enums
+{
+    [Flags]
+    public enum MovementFlag3 : uint
+    {
+        None           = 0x00000000,
+        DisableInertia = 0x00000001,
+    }
+}
diff --git a/WowPacketParserModule.V2_5_1_38707/Parsers/UpdateHandler.cs b/WowPacketParserModule.V2_5_1_38707/Parsers/UpdateHandler.cs
@@ -141,9 +141,8 @@ private static MovementInfo ReadMovementUpdateBlock(Packet packet, WowGuid guid,
                 if (ClientVersion.AddedInVersion(ClientVersionBuild.V2_5_3_41812))
                 {
                     moveInfo.Flags = (uint)packet.ReadUInt32E<MovementFlag>("Movement Flags", index);
-                    moveInfo.Flags2 = (uint)packet.ReadUInt32E<MovementFlag2>("Extra Movement Flags", index);
-
-                    packet.ReadUInt32("MovementFlags3", index);
+                    moveInfo.Flags2 = (uint)packet.ReadUInt32E<MovementFlag2>("Movement Flags 2", index);
+                    moveInfo.Flags3 = (uint)packet.ReadUInt32E<MovementFlag3>("Movement Flags 3", index);
                 }
 
                 packet.ReadUInt32("MoveTime", index);
@@ -170,10 +169,18 @@ private static MovementInfo ReadMovementUpdateBlock(Packet packet, WowGuid guid,
                 packet.ReadBit("HasSpline", index);
                 packet.ReadBit("HeightChangeFailed", index);
                 packet.ReadBit("RemoteTimeValid", index);
+                var hasInertia = ClientVersion.AddedInVersion(ClientVersionBuild.V2_5_3_41812) && packet.ReadBit("Has Inertia", index);
 
                 if (hasTransport)
                     V8_0_1_27101.Parsers.UpdateHandler.ReadTransportData(moveInfo, guid, packet, index);
 
+                if (hasInertia)
+                {
+                    packet.ReadPackedGuid128("GUID", index, "Inertia");
+                    packet.ReadVector3("Force", index, "Inertia");
+                    packet.ReadUInt32("Lifetime", index, "Inertia");
+                }
+
                 if (hasFall)
                 {
                     packet.ResetBitReader();