From 90451c1d3f8c784fe80113a13e06fa95b73f39d3 Mon Sep 17 00:00:00 2001
From: UltraNix <80540499+UltraNix@users.noreply.github.com>
Date: Mon, 6 Dec 2021 20:56:40 +0100
Subject: [PATCH] fix(Core/Movement): Unroot should remove MOVEMENTFLAG_FALLING
 if not really falling (#9428)

- Closes #9187
---
 src/server/game/Handlers/MovementHandler.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp
index 11d5a7ed7..8006e63fe 100644
--- a/src/server/game/Handlers/MovementHandler.cpp
+++ b/src/server/game/Handlers/MovementHandler.cpp
@@ -997,6 +997,11 @@ void WorldSession::HandleMoveUnRootAck(WorldPacket& recvData)
         movementInfo.time = (uint32)movementTime;
     }
 
+    if (G3D::fuzzyEq(movementInfo.fallTime, 0.f))
+    {
+        movementInfo.RemoveMovementFlag(MOVEMENTFLAG_FALLING);
+    }
+
     movementInfo.guid = mover->GetGUID();
     mover->m_movementInfo = movementInfo;
     mover->UpdatePosition(movementInfo.pos);