Core/PacketIO: Updated SMSG_UPDATE_OBJECT

4 files changed, 263 insertions, 289 deletions

diff --git a/src/server/game/Movement/MovementStructures.cpp b/src/server/game/Movement/MovementStructures.cpp
index 20011a443d7..85dabf8ed20 100644
--- a/src/server/game/Movement/MovementStructures.cpp
+++ b/src/server/game/Movement/MovementStructures.cpp
@@ -42,13 +42,13 @@ MovementStatusElements const PlayerMove[] =
     MSEHasTransportData,
     MSEMovementFlags,
     MSEHasTransportGuidByte3,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte4,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte2,
     MSEHasPitch,
@@ -62,7 +62,7 @@ MovementStatusElements const PlayerMove[] =
     MSEGuidByte7,
     MSEPositionY,
     MSEGuidByte3,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte6,
     MSETransportSeat,
     MSETransportGuidByte5,
@@ -70,7 +70,7 @@ MovementStatusElements const PlayerMove[] =
     MSETransportGuidByte1,
     MSETransportOrientation,
     MSETransportGuidByte2,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte0,
     MSETransportPositionZ,
     MSETransportGuidByte7,
@@ -118,8 +118,8 @@ MovementStatusElements const MovementFallLand[] =
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte2,
-    MSEHasTransportTime3,
-    MSEHasTransportTime2,
+    MSEHasTransportVehicleId,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte1,
@@ -140,10 +140,10 @@ MovementStatusElements const MovementFallLand[] =
     MSETransportPositionY,
     MSETransportPositionX,
     MSETransportGuidByte5,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte1,
     MSETransportSeat,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte4,
     MSETransportOrientation,
     MSETransportGuidByte0,
@@ -186,10 +186,10 @@ MovementStatusElements const MovementHeartBeat[] =
     MSEZeroBit,
     MSEHasGuidByte6,
     MSEHasMovementFlags,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte2,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte6,
@@ -218,8 +218,8 @@ MovementStatusElements const MovementHeartBeat[] =
     MSETransportGuidByte1,
     MSETransportGuidByte3,
     MSETransportGuidByte7,
-    MSETransportTime3,
-    MSETransportTime2,
+    MSETransportVehicleId,
+    MSETransportPrevTime,
     MSETransportGuidByte2,
     MSETransportGuidByte0,
     MSETransportGuidByte6,
@@ -265,8 +265,8 @@ MovementStatusElements const MovementJump[] =
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte4,
-    MSEHasTransportTime3,
-    MSEHasTransportTime2,
+    MSEHasTransportVehicleId,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte2,
     MSEHasFallDirection,
     MSEMovementFlags,
@@ -283,10 +283,10 @@ MovementStatusElements const MovementJump[] =
     MSETransportGuidByte7,
     MSETransportPositionX,
     MSETransportGuidByte4,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte0,
     MSETransportOrientation,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportTime,
     MSETransportGuidByte6,
     MSETransportPositionZ,
@@ -330,14 +330,14 @@ MovementStatusElements const MovementSetFacing[] =
     MSEHasGuidByte3,
     MSEZeroBit,
     MSEHasGuidByte1,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte2,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte0,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte1,
     MSEHasFallDirection,
@@ -354,12 +354,12 @@ MovementStatusElements const MovementSetFacing[] =
     MSETransportGuidByte0,
     MSETransportPositionX,
     MSETransportGuidByte1,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte4,
     MSETransportPositionZ,
     MSETransportOrientation,
     MSETransportGuidByte2,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte3,
     MSETransportSeat,
     MSETransportPositionY,
@@ -409,9 +409,9 @@ MovementStatusElements const MovementSetPitch[] =
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte5,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte7,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEMovementFlags2,
     MSEMovementFlags,
     MSEHasFallDirection,
@@ -428,12 +428,12 @@ MovementStatusElements const MovementSetPitch[] =
     MSETransportGuidByte6,
     MSETransportOrientation,
     MSETransportGuidByte1,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportTime,
     MSETransportGuidByte2,
     MSETransportPositionZ,
     MSETransportGuidByte0,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportPositionY,
     MSETransportGuidByte5,
     MSETransportSeat,
@@ -476,14 +476,14 @@ MovementStatusElements const MovementStartBackward[] =
     MSEHasSplineElevation,
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte1,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte2,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte4,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEMovementFlags,
     MSEMovementFlags2,
     MSEHasFallDirection,
@@ -497,13 +497,13 @@ MovementStatusElements const MovementStartBackward[] =
     MSEGuidByte3,
     MSETransportPositionZ,
     MSETransportGuidByte2,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte0,
     MSETransportGuidByte5,
     MSETransportPositionY,
     MSETransportGuidByte1,
     MSETransportPositionX,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte4,
     MSETransportOrientation,
     MSETransportSeat,
@@ -555,8 +555,8 @@ MovementStatusElements const MovementStartForward[] =
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte1,
-    MSEHasTransportTime3,
-    MSEHasTransportTime2,
+    MSEHasTransportVehicleId,
+    MSEHasTransportPrevTime,
     MSEHasFallDirection,
     MSEMovementFlags2,
     MSEGuidByte2,
@@ -582,12 +582,12 @@ MovementStatusElements const MovementStartForward[] =
     MSETransportGuidByte2,
     MSETransportPositionX,
     MSETransportGuidByte5,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportTime,
     MSETransportGuidByte6,
     MSETransportGuidByte0,
     MSETransportSeat,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSESplineElevation,
     MSEPitch,
     MSEOrientation,
@@ -620,9 +620,9 @@ MovementStatusElements const MovementStartStrafeLeft[] =
     MSEHasMovementFlags,
     MSEHasTransportData,
     MSEHasFallDirection,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte7,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte6,
@@ -647,10 +647,10 @@ MovementStatusElements const MovementStartStrafeLeft[] =
     MSEFallVerticalSpeed,
     MSETransportSeat,
     MSETransportGuidByte2,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte3,
     MSETransportPositionZ,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte0,
     MSETransportGuidByte7,
     MSETransportPositionY,
@@ -696,11 +696,11 @@ MovementStatusElements const MovementStartStrafeRight[] =
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte0,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte4,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEMovementFlags2,
     MSEMovementFlags,
     MSEHasFallDirection,
@@ -721,11 +721,11 @@ MovementStatusElements const MovementStartStrafeRight[] =
     MSETransportGuidByte2,
     MSETransportSeat,
     MSETransportPositionX,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportTime,
     MSETransportGuidByte4,
     MSETransportGuidByte7,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportPositionZ,
     MSETransportGuidByte3,
     MSEPitch,
@@ -767,9 +767,9 @@ MovementStatusElements const MovementStartTurnLeft[] =
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte0,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte2,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte5,
@@ -801,8 +801,8 @@ MovementStatusElements const MovementStartTurnLeft[] =
     MSETransportGuidByte1,
     MSETransportGuidByte3,
     MSETransportPositionY,
-    MSETransportTime3,
-    MSETransportTime2,
+    MSETransportVehicleId,
+    MSETransportPrevTime,
     MSETransportGuidByte5,
     MSETransportGuidByte7,
     MSETimestamp,
@@ -836,7 +836,7 @@ MovementStatusElements const MovementStartTurnRight[] =
     MSEHasPitch,
     MSEHasFallData,
     MSEHasTransportGuidByte1,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte3,
@@ -844,7 +844,7 @@ MovementStatusElements const MovementStartTurnRight[] =
     MSEHasTransportGuidByte2,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte7,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEMovementFlags2,
     MSEMovementFlags,
     MSEHasFallDirection,
@@ -865,13 +865,13 @@ MovementStatusElements const MovementStartTurnRight[] =
     MSETransportSeat,
     MSETransportOrientation,
     MSETransportGuidByte5,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportPositionZ,
     MSETransportPositionX,
     MSETransportTime,
     MSETransportGuidByte7,
     MSETransportGuidByte3,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSEFallHorizontalSpeed,
     MSEFallCosAngle,
     MSEFallSinAngle,
@@ -911,8 +911,8 @@ MovementStatusElements const MovementStop[] =
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte5,
-    MSEHasTransportTime2,
-    MSEHasTransportTime3,
+    MSEHasTransportPrevTime,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte0,
@@ -933,13 +933,13 @@ MovementStatusElements const MovementStop[] =
     MSETransportTime,
     MSETransportSeat,
     MSETransportPositionZ,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte2,
     MSETransportGuidByte0,
     MSETransportPositionY,
     MSETransportGuidByte1,
     MSETransportGuidByte3,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportPositionX,
     MSETransportOrientation,
     MSETransportGuidByte5,
@@ -985,10 +985,10 @@ MovementStatusElements const MovementStopStrafe[] =
     MSEHasTransportGuidByte2,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte5,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte3,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEMovementFlags,
     MSEHasFallDirection,
     MSEMovementFlags2,
@@ -1003,7 +1003,7 @@ MovementStatusElements const MovementStopStrafe[] =
     MSETransportSeat,
     MSETransportGuidByte6,
     MSETransportPositionZ,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte1,
     MSETransportGuidByte3,
     MSETransportGuidByte2,
@@ -1014,7 +1014,7 @@ MovementStatusElements const MovementStopStrafe[] =
     MSETransportPositionX,
     MSETransportGuidByte0,
     MSETransportPositionY,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte7,
     MSEFallSinAngle,
     MSEFallHorizontalSpeed,
@@ -1053,9 +1053,9 @@ MovementStatusElements const MovementStopTurn[] =
     MSEHasGuidByte7,
     MSEHasTransportGuidByte2,
     MSEHasTransportGuidByte7,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte4,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte3,
@@ -1079,8 +1079,8 @@ MovementStatusElements const MovementStopTurn[] =
     MSETransportGuidByte2,
     MSETransportGuidByte3,
     MSETransportOrientation,
-    MSETransportTime2,
-    MSETransportTime3,
+    MSETransportPrevTime,
+    MSETransportVehicleId,
     MSETransportGuidByte7,
     MSETransportGuidByte1,
     MSETransportGuidByte0,
@@ -1126,11 +1126,11 @@ MovementStatusElements const MovementStartAscend[] =
     MSEMovementFlags,
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte2,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte4,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte7,
@@ -1152,9 +1152,9 @@ MovementStatusElements const MovementStartAscend[] =
     MSETransportOrientation,
     MSETransportPositionY,
     MSETransportGuidByte7,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportPositionZ,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte6,
     MSETransportTime,
     MSETransportGuidByte0,
@@ -1198,11 +1198,11 @@ MovementStatusElements const MovementStartDescend[] =
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte2,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte6,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte5,
     MSEMovementFlags2,
@@ -1219,9 +1219,9 @@ MovementStatusElements const MovementStartDescend[] =
     MSEPitch,
     MSETransportPositionZ,
     MSETransportSeat,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte6,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte1,
     MSETransportTime,
     MSETransportGuidByte4,
@@ -1273,10 +1273,10 @@ MovementStatusElements const MovementStartSwim[] =
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte0,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte1,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEMovementFlags,
     MSEHasFallDirection,
     MSEMovementFlags2,
@@ -1289,14 +1289,14 @@ MovementStatusElements const MovementStartSwim[] =
     MSEGuidByte3,
     MSEGuidByte7,
     MSEPitch,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte2,
     MSETransportPositionY,
     MSETransportGuidByte3,
     MSETransportTime,
     MSETransportPositionX,
     MSETransportOrientation,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte6,
     MSETransportGuidByte5,
     MSETransportGuidByte4,
@@ -1339,14 +1339,14 @@ MovementStatusElements const MovementStopSwim[] =
     MSEHasGuidByte1,
     MSEHasGuidByte0,
     MSEHasFallData,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte0,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte2,
     MSEHasTransportGuidByte5,
     MSEMovementFlags,
@@ -1360,7 +1360,7 @@ MovementStatusElements const MovementStopSwim[] =
     MSEGuidByte1,
     MSEGuidByte5,
     MSEGuidByte2,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte4,
     MSETransportTime,
     MSETransportPositionZ,
@@ -1372,7 +1372,7 @@ MovementStatusElements const MovementStopSwim[] =
     MSETransportGuidByte1,
     MSETransportGuidByte6,
     MSETransportGuidByte5,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportPositionX,
     MSETransportGuidByte0,
     MSETransportOrientation,
@@ -1411,8 +1411,8 @@ MovementStatusElements const MovementStopAscend[] =
     MSEHasMovementFlags2,
     MSEHasTimestamp,
     MSEHasGuidByte5,
-    MSEHasTransportTime2,
-    MSEHasTransportTime3,
+    MSEHasTransportPrevTime,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte2,
@@ -1437,8 +1437,8 @@ MovementStatusElements const MovementStopAscend[] =
     MSETransportGuidByte7,
     MSETransportGuidByte2,
     MSETransportGuidByte6,
-    MSETransportTime2,
-    MSETransportTime3,
+    MSETransportPrevTime,
+    MSETransportVehicleId,
     MSETransportOrientation,
     MSETransportGuidByte3,
     MSETransportGuidByte4,
@@ -1487,10 +1487,10 @@ MovementStatusElements const MovementStopPitch[] =
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte2,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte3,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte1,
     MSEHasFallDirection,
@@ -1512,14 +1512,14 @@ MovementStatusElements const MovementStopPitch[] =
     MSEFallTime,
     MSETransportGuidByte5,
     MSETransportGuidByte2,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportPositionX,
     MSETransportOrientation,
     MSETransportGuidByte6,
     MSETransportGuidByte3,
     MSETransportGuidByte1,
     MSETransportPositionZ,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte0,
     MSETransportGuidByte4,
     MSETransportTime,
@@ -1557,11 +1557,11 @@ MovementStatusElements const MovementStartPitchDown[] =
     MSEHasGuidByte2,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte5,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte6,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte2,
@@ -1576,9 +1576,9 @@ MovementStatusElements const MovementStartPitchDown[] =
     MSEGuidByte6,
     MSEGuidByte4,
     MSEGuidByte1,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte3,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte5,
     MSETransportGuidByte1,
     MSETransportPositionY,
@@ -1631,9 +1631,9 @@ MovementStatusElements const MovementStartPitchUp[] =
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte1,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte4,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte5,
@@ -1657,11 +1657,11 @@ MovementStatusElements const MovementStartPitchUp[] =
     MSETransportPositionZ,
     MSETransportOrientation,
     MSETransportGuidByte7,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportSeat,
     MSETransportGuidByte6,
     MSETransportGuidByte5,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportPositionY,
     MSETransportGuidByte4,
     MSEFallTime,
@@ -1700,12 +1700,12 @@ MovementStatusElements const MoveChngTransport[]=
     MSEHasMovementFlags,
     MSEHasMovementFlags2,
     MSEHasTransportGuidByte3,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte2,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte5,
@@ -1729,13 +1729,13 @@ MovementStatusElements const MoveChngTransport[]=
     MSETransportGuidByte6,
     MSETransportPositionZ,
     MSETransportPositionX,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportTime,
     MSETransportGuidByte7,
     MSETransportGuidByte5,
     MSETransportGuidByte4,
     MSETransportOrientation,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSEFallTime,
     MSEFallHorizontalSpeed,
     MSEFallSinAngle,
@@ -1778,9 +1778,9 @@ MovementStatusElements const MoveSplineDone[] =
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte6,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte2,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte0,
 
     MSEHasFallDirection,
@@ -1806,7 +1806,7 @@ MovementStatusElements const MoveSplineDone[] =
     MSEOrientation,
 
     MSETransportGuidByte1,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte7,
     MSETransportTime,
     MSETransportPositionY,
@@ -1815,7 +1815,7 @@ MovementStatusElements const MoveSplineDone[] =
     MSETransportSeat,
     MSETransportOrientation,
     MSETransportGuidByte0,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte2,
     MSETransportGuidByte3,
     MSETransportGuidByte5,
@@ -1856,10 +1856,10 @@ MovementStatusElements const MoveNotActiveMover[] =
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte2,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte7,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte3,
 
     MSEHasFallDirection,
@@ -1881,9 +1881,9 @@ MovementStatusElements const MoveNotActiveMover[] =
     MSEFallHorizontalSpeed,
     MSEFallTime,
 
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte1,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportOrientation,
     MSETransportGuidByte0,
     MSETransportSeat,
@@ -1931,7 +1931,7 @@ MovementStatusElements const DismissControlledVehicle[] =
     MSEHasGuidByte5,
 
     MSEHasTransportGuidByte5,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte2,
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte7,
@@ -1939,7 +1939,7 @@ MovementStatusElements const DismissControlledVehicle[] =
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte6,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
 
     MSEMovementFlags2,
     MSEHasFallDirection,
@@ -1956,10 +1956,10 @@ MovementStatusElements const DismissControlledVehicle[] =
 
     MSETimestamp,
 
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte4,
     MSETransportGuidByte7,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte6,
     MSETransportTime,
     MSETransportPositionZ,
@@ -2007,10 +2007,10 @@ MovementStatusElements const MoveUpdateTeleport[] =
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte0,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte6,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte2,
 
     MSEZeroBit,
@@ -2031,9 +2031,9 @@ MovementStatusElements const MoveUpdateTeleport[] =
     MSETransportGuidByte3,
     MSETransportGuidByte4,
     MSETransportOrientation,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte1,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportPositionZ,
     MSETransportGuidByte7,
     MSETransportGuidByte0,
@@ -2092,11 +2092,11 @@ MovementStatusElements const MovementSetRunMode[] =
     MSEHasGuidByte2,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte4,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte1,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte2,
@@ -2112,7 +2112,7 @@ MovementStatusElements const MovementSetRunMode[] =
     MSEGuidByte5,
     MSEGuidByte2,
     MSEPitch,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte3,
     MSETransportPositionX,
     MSETransportSeat,
@@ -2124,7 +2124,7 @@ MovementStatusElements const MovementSetRunMode[] =
     MSETransportOrientation,
     MSETransportGuidByte4,
     MSETransportTime,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte0,
     MSETransportPositionY,
     MSETransportGuidByte6,
@@ -2167,9 +2167,9 @@ MovementStatusElements const MovementSetWalkMode[] =
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte3,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte5,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte7,
     MSEHasFallDirection,
@@ -2192,10 +2192,10 @@ MovementStatusElements const MovementSetWalkMode[] =
     MSETransportGuidByte0,
     MSETransportTime,
     MSETransportGuidByte4,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportOrientation,
     MSETransportPositionX,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte7,
     MSETransportPositionY,
     MSETransportGuidByte1,
@@ -2235,12 +2235,12 @@ MovementStatusElements const MovementSetCanFly[] =
     MSEZeroBit,
     MSEHasPitch,
     MSEHasTransportGuidByte3,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte4,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte2,
     MSEHasTransportGuidByte5,
@@ -2262,7 +2262,7 @@ MovementStatusElements const MovementSetCanFly[] =
     MSETransportSeat,
     MSETransportPositionX,
     MSETransportGuidByte2,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportPositionY,
     MSETransportGuidByte1,
     MSETransportTime,
@@ -2270,7 +2270,7 @@ MovementStatusElements const MovementSetCanFly[] =
     MSETransportGuidByte0,
     MSETransportOrientation,
     MSETransportGuidByte6,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSESplineElevation,
     MSEFallSinAngle,
     MSEFallCosAngle,
@@ -2309,12 +2309,12 @@ MovementStatusElements const MovementSetCanTransitionBetweenSwimAndFlyAck[] =
     MSEHasGuidByte7,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte2,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte5,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte1,
     MSEMovementFlags2,
@@ -2345,10 +2345,10 @@ MovementStatusElements const MovementSetCanTransitionBetweenSwimAndFlyAck[] =
     MSETransportGuidByte2,
     MSETransportGuidByte7,
     MSETransportPositionX,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte6,
     MSETransportOrientation,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSEPitch,
     MSEOrientation,
     MSETimestamp,
@@ -2440,8 +2440,8 @@ MovementStatusElements const MovementUpdateRunSpeed[] =
     MSEHasOrientation,
     MSEHasTransportData,
     MSEHasTransportGuidByte5,
-    MSEHasTransportTime2,
-    MSEHasTransportTime3,
+    MSEHasTransportPrevTime,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte2,
@@ -2463,11 +2463,11 @@ MovementStatusElements const MovementUpdateRunSpeed[] =
     MSETransportTime,
     MSETransportGuidByte7,
     MSETransportSeat,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportPositionY,
     MSETransportGuidByte3,
     MSETransportGuidByte2,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportPositionZ,
     MSETimestamp,
     MSEFallCosAngle,
@@ -2634,9 +2634,9 @@ MovementStatusElements const MovementForceRunSpeedChangeAck[] =
     MSEHasGuidByte5,
     MSEHasMovementFlags,
     MSEHasGuidByte3,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte5,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte2,
     MSEHasTransportGuidByte0,
@@ -2661,13 +2661,13 @@ MovementStatusElements const MovementForceRunSpeedChangeAck[] =
     MSETransportPositionY,
     MSETransportGuidByte0,
     MSETransportGuidByte5,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportPositionX,
     MSETransportTime,
     MSETransportGuidByte7,
     MSETransportOrientation,
     MSETransportGuidByte3,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte2,
     MSETransportSeat,
     MSETransportGuidByte4,
@@ -2712,8 +2712,8 @@ MovementStatusElements const MovementSetCollisionHeightAck[] =
     MSEHasGuidByte0,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte3,
-    MSEHasTransportTime2,
-    MSEHasTransportTime3,
+    MSEHasTransportPrevTime,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte7,
@@ -2733,7 +2733,7 @@ MovementStatusElements const MovementSetCollisionHeightAck[] =
     MSEGuidByte4,
     MSETransportPositionX,
     MSETransportGuidByte4,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte0,
     MSETransportOrientation,
     MSETransportPositionY,
@@ -2745,7 +2745,7 @@ MovementStatusElements const MovementSetCollisionHeightAck[] =
     MSETransportGuidByte6,
     MSETransportGuidByte3,
     MSETransportGuidByte1,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportPositionZ,
     MSEFallVerticalSpeed,
     MSEFallTime,
@@ -2787,9 +2787,9 @@ MovementStatusElements const MovementForceFlightSpeedChangeAck[] =
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte7,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte0,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte2,
     MSEHasTransportGuidByte5,
@@ -2808,11 +2808,11 @@ MovementStatusElements const MovementForceFlightSpeedChangeAck[] =
     MSETransportGuidByte6,
     MSETransportGuidByte0,
     MSETransportSeat,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportOrientation,
     MSETransportGuidByte1,
     MSETransportGuidByte5,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte2,
     MSETransportPositionZ,
     MSETransportGuidByte7,
@@ -2860,8 +2860,8 @@ MovementStatusElements const MovementSetCanFlyAck[] =
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte2,
-    MSEHasTransportTime3,
-    MSEHasTransportTime2,
+    MSEHasTransportVehicleId,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte7,
@@ -2878,10 +2878,10 @@ MovementStatusElements const MovementSetCanFlyAck[] =
     MSEGuidByte6,
     MSEGuidByte4,
     MSEGuidByte5,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte6,
     MSETransportTime,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte7,
     MSETransportPositionZ,
     MSETransportGuidByte3,
@@ -2937,8 +2937,8 @@ MovementStatusElements const MovementForceSwimSpeedChangeAck[] =
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte3,
-    MSEHasTransportTime2,
-    MSEHasTransportTime3,
+    MSEHasTransportPrevTime,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte2,
     MSEMovementFlags2,
@@ -2953,8 +2953,8 @@ MovementStatusElements const MovementForceSwimSpeedChangeAck[] =
     MSEGuidByte4,
     MSEGuidByte7,
     MSETransportGuidByte0,
-    MSETransportTime3,
-    MSETransportTime2,
+    MSETransportVehicleId,
+    MSETransportPrevTime,
     MSETransportPositionX,
     MSETransportGuidByte7,
     MSETransportSeat,
@@ -3005,11 +3005,11 @@ MovementStatusElements const MovementForceWalkSpeedChangeAck[] =
     MSEHasGuidByte7,
     MSEHasGuidByte6,
     MSEHasPitch,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte6,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte2,
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte4,
@@ -3037,7 +3037,7 @@ MovementStatusElements const MovementForceWalkSpeedChangeAck[] =
     MSETransportPositionX,
     MSETransportGuidByte0,
     MSETransportTime,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportPositionY,
     MSETransportGuidByte2,
     MSETransportGuidByte4,
@@ -3046,7 +3046,7 @@ MovementStatusElements const MovementForceWalkSpeedChangeAck[] =
     MSETransportOrientation,
     MSETransportSeat,
     MSETransportGuidByte6,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSESplineElevation,
     MSETimestamp,
     MSEOrientation,
@@ -3080,12 +3080,12 @@ MovementStatusElements const MovementForceRunBackSpeedChangeAck[] =
     MSEHasSplineElevation,
     MSEZeroBit,
     MSEHasTransportGuidByte3,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte2,
     MSEHasTransportGuidByte1,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte5,
@@ -3112,12 +3112,12 @@ MovementStatusElements const MovementForceRunBackSpeedChangeAck[] =
     MSETransportGuidByte0,
     MSETransportGuidByte2,
     MSETransportPositionY,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportPositionX,
     MSETransportOrientation,
     MSETransportGuidByte3,
     MSETransportTime,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte4,
     MSETransportPositionZ,
     MSETransportGuidByte7,
@@ -3278,9 +3278,9 @@ MovementStatusElements const ForceMoveRootAck[] =
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte2,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte4,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte5,
     MSEMovementFlags2,
     MSEMovementFlags,
@@ -3297,8 +3297,8 @@ MovementStatusElements const ForceMoveRootAck[] =
     MSETransportGuidByte4,
     MSETransportOrientation,
     MSETransportPositionZ,
-    MSETransportTime3,
-    MSETransportTime2,
+    MSETransportVehicleId,
+    MSETransportPrevTime,
     MSETransportGuidByte7,
     MSETransportGuidByte2,
     MSETransportGuidByte0,
@@ -3347,9 +3347,9 @@ MovementStatusElements const ForceMoveUnrootAck[] =
     MSEHasGuidByte6,
     MSEHasFallDirection,
     MSEHasTransportGuidByte0,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte6,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte7,
@@ -3371,12 +3371,12 @@ MovementStatusElements const ForceMoveUnrootAck[] =
     MSETransportGuidByte2,
     MSETransportGuidByte3,
     MSETransportPositionY,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte5,
     MSETransportSeat,
     MSETransportGuidByte0,
     MSETransportTime,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte4,
     MSETransportOrientation,
     MSETransportPositionX,
@@ -3421,9 +3421,9 @@ MovementStatusElements const MovementFallReset[] =
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte4,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte2,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte3,
@@ -3446,9 +3446,9 @@ MovementStatusElements const MovementFallReset[] =
     MSETransportPositionY,
     MSETransportPositionZ,
     MSETransportSeat,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte6,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportTime,
     MSETransportGuidByte0,
     MSETransportOrientation,
@@ -3491,13 +3491,13 @@ MovementStatusElements const MovementFeatherFallAck[] =
     MSEHasGuidByte0,
     MSEHasGuidByte4,
     MSEHasTransportGuidByte6,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte2,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte5,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte0,
     MSEHasFallDirection,
@@ -3511,7 +3511,7 @@ MovementStatusElements const MovementFeatherFallAck[] =
     MSEGuidByte4,
     MSEGuidByte3,
     MSEGuidByte2,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportOrientation,
     MSETransportPositionZ,
     MSETransportGuidByte7,
@@ -3520,7 +3520,7 @@ MovementStatusElements const MovementFeatherFallAck[] =
     MSETransportPositionX,
     MSETransportGuidByte1,
     MSETransportGuidByte6,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportTime,
     MSETransportPositionY,
     MSETransportGuidByte4,
@@ -3564,7 +3564,7 @@ MovementStatusElements const MovementGravityDisableAck[] =
     MSEHasFallData,
     MSEHasGuidByte1,
     MSEHasTransportGuidByte2,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte5,
@@ -3572,7 +3572,7 @@ MovementStatusElements const MovementGravityDisableAck[] =
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte4,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEMovementFlags,
     MSEMovementFlags2,
     MSEHasFallDirection,
@@ -3596,10 +3596,10 @@ MovementStatusElements const MovementGravityDisableAck[] =
     MSETransportGuidByte1,
     MSETransportGuidByte0,
     MSETransportOrientation,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportPositionX,
     MSETransportGuidByte7,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSEFallSinAngle,
     MSEFallCosAngle,
     MSEFallHorizontalSpeed,
@@ -3636,14 +3636,14 @@ MovementStatusElements const MovementGravityEnableAck[] =
     MSEHasMovementFlags,
     MSEHasFallData,
     MSEHasGuidByte0,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte2,
     MSEHasTransportGuidByte5,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte6,
     MSEHasFallDirection,
@@ -3664,7 +3664,7 @@ MovementStatusElements const MovementGravityEnableAck[] =
     MSEFallVerticalSpeed,
     MSETransportGuidByte1,
     MSETransportPositionX,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportOrientation,
     MSETransportGuidByte2,
     MSETransportGuidByte0,
@@ -3674,7 +3674,7 @@ MovementStatusElements const MovementGravityEnableAck[] =
     MSETransportGuidByte3,
     MSETransportGuidByte4,
     MSETransportPositionZ,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte5,
     MSETransportTime,
     MSETransportPositionY,
@@ -3711,14 +3711,14 @@ MovementStatusElements const MovementHoverAck[] =
     MSEHasGuidByte3,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte6,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte3,
     MSEHasTransportGuidByte2,
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte7,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEMovementFlags,
     MSEMovementFlags2,
     MSEHasFallDirection,
@@ -3738,7 +3738,7 @@ MovementStatusElements const MovementHoverAck[] =
     MSEFallVerticalSpeed,
     MSEOrientation,
     MSETransportGuidByte1,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte2,
     MSETransportGuidByte7,
     MSETransportGuidByte3,
@@ -3751,7 +3751,7 @@ MovementStatusElements const MovementHoverAck[] =
     MSETransportGuidByte0,
     MSETransportPositionY,
     MSETransportGuidByte5,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte6,
     MSESplineElevation,
     MSEPitch,
@@ -3785,9 +3785,9 @@ MovementStatusElements const MovementKnockBackAck[] =
     MSEMovementFlags,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte1,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte0,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte2,
     MSEHasTransportGuidByte3,
@@ -3811,14 +3811,14 @@ MovementStatusElements const MovementKnockBackAck[] =
     MSETimestamp,
     MSETransportPositionY,
     MSETransportGuidByte4,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte7,
     MSETransportOrientation,
     MSETransportGuidByte6,
     MSETransportTime,
     MSETransportGuidByte3,
     MSETransportGuidByte1,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte2,
     MSETransportPositionZ,
     MSETransportGuidByte0,
@@ -3861,9 +3861,9 @@ MovementStatusElements const MovementWaterWalkAck[] =
     MSEHasTransportGuidByte2,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte5,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte3,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte4,
     MSEMovementFlags,
     MSEHasFallDirection,
@@ -3878,12 +3878,12 @@ MovementStatusElements const MovementWaterWalkAck[] =
     MSEGuidByte1,
     MSETransportPositionX,
     MSETransportGuidByte1,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportGuidByte0,
     MSETransportOrientation,
     MSETransportGuidByte7,
     MSETransportPositionY,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportTime,
     MSETransportGuidByte5,
     MSETransportSeat,
@@ -4986,10 +4986,10 @@ MovementStatusElements const ChangeSeatsOnControlledVehicle[] =
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte5,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte2,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte4,
     MSEHasTransportGuidByte6,
     MSEMovementFlags2,
@@ -5017,8 +5017,8 @@ MovementStatusElements const ChangeSeatsOnControlledVehicle[] =
     MSEFallTime,
     MSEFallVerticalSpeed,
     MSETransportGuidByte2,
-    MSETransportTime2,
-    MSETransportTime3,
+    MSETransportPrevTime,
+    MSETransportVehicleId,
     MSETransportGuidByte0,
     MSETransportTime,
     MSETransportSeat,
@@ -5064,10 +5064,10 @@ MovementStatusElements const CastSpellEmbeddedMovement[] =
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte2,
     MSEHasTransportGuidByte5,
-    MSEHasTransportTime2,
+    MSEHasTransportPrevTime,
     MSEHasTransportGuidByte7,
     MSEHasTransportGuidByte4,
-    MSEHasTransportTime3,
+    MSEHasTransportVehicleId,
     MSEHasTransportGuidByte0,
     MSEHasTransportGuidByte1,
     MSEHasTransportGuidByte3,
@@ -5087,13 +5087,13 @@ MovementStatusElements const CastSpellEmbeddedMovement[] =
     MSETransportTime,
     MSETransportGuidByte6,
     MSETransportGuidByte5,
-    MSETransportTime3,
+    MSETransportVehicleId,
     MSETransportPositionX,
     MSETransportGuidByte4,
     MSETransportPositionZ,
     MSETransportGuidByte2,
     MSETransportGuidByte0,
-    MSETransportTime2,
+    MSETransportPrevTime,
     MSETransportGuidByte1,
     MSETransportGuidByte3,
     MSETransportPositionY,
diff --git a/src/server/game/Movement/MovementStructures.h b/src/server/game/Movement/MovementStructures.h
index d348d08b415..4c7fbd1212b 100644
--- a/src/server/game/Movement/MovementStructures.h
+++ b/src/server/game/Movement/MovementStructures.h
@@ -48,8 +48,8 @@ enum MovementStatusElements
     MSEHasTransportGuidByte5,
     MSEHasTransportGuidByte6,
     MSEHasTransportGuidByte7,
-    MSEHasTransportTime2,
-    MSEHasTransportTime3,
+    MSEHasTransportPrevTime,
+    MSEHasTransportVehicleId,
     MSEHasPitch,
     MSEHasFallData,
     MSEHasFallDirection,
@@ -85,8 +85,8 @@ enum MovementStatusElements
     MSETransportOrientation,
     MSETransportSeat,
     MSETransportTime,
-    MSETransportTime2,
-    MSETransportTime3,
+    MSETransportPrevTime,
+    MSETransportVehicleId,
     MSEPitch,
     MSEFallTime,
     MSEFallVerticalSpeed,
diff --git a/src/server/game/Movement/Spline/MovementPacketBuilder.cpp b/src/server/game/Movement/Spline/MovementPacketBuilder.cpp
index fa44c19c354..02fdabb3938 100644
--- a/src/server/game/Movement/Spline/MovementPacketBuilder.cpp
+++ b/src/server/game/Movement/Spline/MovementPacketBuilder.cpp
@@ -149,100 +149,75 @@ namespace Movement
             WriteLinearPath(spline, data);
     }
 
-    void PacketBuilder::WriteCreateBits(MoveSpline const& moveSpline, ByteBuffer& data)
+    void PacketBuilder::WriteCreate(MoveSpline const& moveSpline, ByteBuffer& data)
     {
-        if (!data.WriteBit(!moveSpline.Finalized()))
-            return;
-
-        data.WriteBits(uint8(moveSpline.spline.mode()), 2);
-        data.WriteBit(moveSpline.splineflags & (MoveSplineFlag::Parabolic | MoveSplineFlag::Animation));
-        data.WriteBits(moveSpline.getPath().size(), 22);
-        switch (moveSpline.splineflags & MoveSplineFlag::Mask_Final_Facing)
+        data << uint32(moveSpline.GetId());                                         // ID
+        if (!moveSpline.isCyclic())                                                 // Destination
         {
-            case MoveSplineFlag::Final_Target:
-            {
-                ObjectGuid targetGuid(moveSpline.facing.target);
-                data.WriteBits(2, 2);
-                data.WriteBit(targetGuid[4]);
-                data.WriteBit(targetGuid[3]);
-                data.WriteBit(targetGuid[7]);
-                data.WriteBit(targetGuid[2]);
-                data.WriteBit(targetGuid[6]);
-                data.WriteBit(targetGuid[1]);
-                data.WriteBit(targetGuid[0]);
-                data.WriteBit(targetGuid[5]);
-                break;
-            }
-            case MoveSplineFlag::Final_Angle:
-                data.WriteBits(0, 2);
-                break;
-            case MoveSplineFlag::Final_Point:
-                data.WriteBits(1, 2);
-                break;
-            default:
-                data.WriteBits(3, 2);
-                break;
+            Vector3 dest = moveSpline.FinalDestination();
+            data << float(dest.z);
+            data << float(dest.x);
+            data << float(dest.y);
         }
+        else
+            data << Vector3::zero();
 
-        data.WriteBit((moveSpline.splineflags & MoveSplineFlag::Parabolic) && moveSpline.effect_start_time < moveSpline.Duration());
-        data.WriteBits(moveSpline.splineflags.raw(), 25);
-    }
-
-    void PacketBuilder::WriteCreateData(MoveSpline const& moveSpline, ByteBuffer& data)
-    {
-        if (!moveSpline.Finalized())
+        if (data.WriteBit(!moveSpline.Finalized()))                                 // MovementSplineMove
         {
             MoveSplineFlag const& splineFlags = moveSpline.splineflags;
+            data.FlushBits();
 
-            if ((splineFlags & MoveSplineFlag::Parabolic) && moveSpline.effect_start_time < moveSpline.Duration())
-                data << moveSpline.vertical_acceleration;   // added in 3.1
+            data.WriteBits(moveSpline.splineflags.raw(), 25);                       // SplineFlags
+            data.WriteBits(uint8(moveSpline.spline.mode()), 2);                     // Mode
 
-            data << moveSpline.timePassed();
+            bool HasJumpGravity = data.WriteBit(moveSpline.splineflags & (MoveSplineFlag::Parabolic | MoveSplineFlag::Animation));    // HasJumpGravity
+            bool HasSpecialTime = data.WriteBit((moveSpline.splineflags & MoveSplineFlag::Parabolic) && moveSpline.effect_start_time < moveSpline.Duration());    // HasSpecialTime
 
             if (splineFlags.final_angle)
-                data << moveSpline.facing.angle;
+                data.WriteBit(3);
             else if (splineFlags.final_target)
-            {
-                ObjectGuid facingGuid(moveSpline.facing.target);
-                data.WriteByteSeq(facingGuid[5]);
-                data.WriteByteSeq(facingGuid[3]);
-                data.WriteByteSeq(facingGuid[7]);
-                data.WriteByteSeq(facingGuid[1]);
-                data.WriteByteSeq(facingGuid[6]);
-                data.WriteByteSeq(facingGuid[4]);
-                data.WriteByteSeq(facingGuid[2]);
-                data.WriteByteSeq(facingGuid[0]);
-            }
-
-            uint32 nodes = moveSpline.getPath().size();
-            for (uint32 i = 0; i < nodes; ++i)
-            {
-                data << float(moveSpline.getPath()[i].z);
-                data << float(moveSpline.getPath()[i].x);
-                data << float(moveSpline.getPath()[i].y);
-            }
+                data.WriteBit(2);
+            else if (splineFlags.final_point)
+                data.WriteBit(1);
+            else
+                data.WriteBit(0);
 
-            if (splineFlags.final_point)
-                data << moveSpline.facing.f.x << moveSpline.facing.f.z << moveSpline.facing.f.y;
+            data.WriteBit(0);                                                       // HasSplineFilterKey
 
-            data << float(1.f);                             // splineInfo.duration_mod_next; added in 3.1
-            data << moveSpline.Duration();
-            if (splineFlags & (MoveSplineFlag::Parabolic | MoveSplineFlag::Animation))
-                data << moveSpline.effect_start_time;       // added in 3.1
+            data << int32(moveSpline.timePassed());                                 // Elapsed
+            data << uint32(moveSpline.Duration());                                  // Duration
+            data << float(1.0f);                                                    // DurationModifier
+            data << float(1.0f);                                                    // NextDurationModifier
 
-            data << float(1.f);                             // splineInfo.duration_mod; added in 3.1
-        }
+            uint32 PointsCount = moveSpline.getPath().size();
+            data << uint32(PointsCount);
 
-        if (!moveSpline.isCyclic())
-        {
-            Vector3 dest = moveSpline.FinalDestination();
-            data << float(dest.z);
-            data << float(dest.x);
-            data << float(dest.y);
+            if (splineFlags.final_angle)                                            // FaceDirection
+                data << moveSpline.facing.angle;
+            else if (splineFlags.final_target)                                      // FaceGUID
+                data << moveSpline.facing.target;
+            else if (splineFlags.final_point)                                       // FaceSpot
+                data << moveSpline.facing.f.x << moveSpline.facing.f.y << moveSpline.facing.f.z;
+
+            if (HasJumpGravity)
+                data << float(moveSpline.vertical_acceleration);                    // JumpGravity
+
+            if (HasSpecialTime)
+                data << uint32(moveSpline.effect_start_time);                       // SpecialTime
+
+            //if (HasSplineFilterKey)
+            //{
+            //    data << uint32(FilterKeysCount);
+            //    for (var i = 0; i < PointsCount; ++i)
+            //    {
+            //        data << float(In);
+            //        data << float(Out);
+            //    }
+
+            //    data.WriteBits(FilterFlags, 2);
+            //}
+
+            data.append<Vector3>(&moveSpline.getPath()[0], PointsCount);            // Points
         }
-        else
-            data << Vector3::zero();
-
-        data << moveSpline.GetId();
     }
 }
diff --git a/src/server/game/Movement/Spline/MovementPacketBuilder.h b/src/server/game/Movement/Spline/MovementPacketBuilder.h
index 750cdc0fdbf..2878a330f67 100644
--- a/src/server/game/Movement/Spline/MovementPacketBuilder.h
+++ b/src/server/game/Movement/Spline/MovementPacketBuilder.h
@@ -37,8 +37,7 @@ namespace Movement
 
         static void WriteMonsterMove(const MoveSpline& mov, WorldPacket& data);
         static void WriteStopMovement(Vector3 const& loc, uint32 splineId, ByteBuffer& data);
-        static void WriteCreateBits(MoveSpline const& moveSpline, ByteBuffer& data);
-        static void WriteCreateData(MoveSpline const& moveSpline, ByteBuffer& data);
+        static void WriteCreate(MoveSpline const& moveSpline, ByteBuffer& data);
     };
 }
 #endif // TRINITYSERVER_PACKET_BUILDER_H