From c5d906c3aa6c843fc2e2ddf257ac3f464528d62c Mon Sep 17 00:00:00 2001
From: Ovahlord <dreadkiller@gmx.de>
Date: Fri, 16 Aug 2019 23:27:56 +0200
Subject: [PATCH] Core/Movement: fixed packet structure for
 CMSG_MOVE_WATER_WALK_ACK

---
 src/server/game/Handlers/MovementHandler.cpp    | 8 --------
 src/server/game/Movement/MovementStructures.cpp | 6 +++---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp
index 825233d3d89..70fbe7955e4 100644
--- a/src/server/game/Handlers/MovementHandler.cpp
+++ b/src/server/game/Handlers/MovementHandler.cpp
@@ -623,16 +623,8 @@ void WorldSession::HandleMoveHoverAck(WorldPacket& recvData)
 void WorldSession::HandleMoveWaterWalkAck(WorldPacket& recvData)
 {
     TC_LOG_DEBUG("network", "CMSG_MOVE_WATER_WALK_ACK");
-
-    ObjectGuid guid;                                        // guid - unused
-    recvData >> guid.ReadAsPacked();
-
-    recvData.read_skip<uint32>();                           // unk
-
     MovementInfo movementInfo;
     GetPlayer()->ReadMovementInfo(recvData, &movementInfo);
-
-    recvData.read_skip<uint32>();                           // unk2
 }
 
 void WorldSession::HandleSummonResponseOpcode(WorldPacket& recvData)
diff --git a/src/server/game/Movement/MovementStructures.cpp b/src/server/game/Movement/MovementStructures.cpp
index 67dd9f76ffe..3964b16da2c 100644
--- a/src/server/game/Movement/MovementStructures.cpp
+++ b/src/server/game/Movement/MovementStructures.cpp
@@ -4157,15 +4157,15 @@ MovementStatusElements const MovementWaterWalkAck[] =
     MSETransportGuidByte6,
     MSETransportGuidByte4,
     MSESplineElevation,
-    MSEFallSinAngle,
-    MSEFallHorizontalSpeed,
     MSEFallCosAngle,
+    MSEFallHorizontalSpeed,
+    MSEFallSinAngle,
     MSEFallVerticalSpeed,
     MSEFallTime,
     MSEOrientation,
     MSETimestamp,
     MSEPitch,
-    MSEEnd,
+    MSEEnd
 };
 
 MovementStatusElements const MovementUpdateKnockBack[] =