From a0da7417a096ec9cb9a8c4b2d09bf8b58ef3c106 Mon Sep 17 00:00:00 2001
From: UltraNix <80540499+UltraNix@users.noreply.github.com>
Date: Mon, 30 May 2022 09:19:53 +0200
Subject: [PATCH] fix(Core/Units): Clear any movement on charm - vol. 2.
 (#11897)

* fix(Core/Units): Clear any movement on charm - vol. 2.

Fixes #11880

* Update.
---
 src/server/game/Entities/Unit/Unit.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 1595ddcb4..1b0ec51ab 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -17930,7 +17930,9 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* au
 
     if (GetTypeId() == TYPEID_UNIT)
     {
+        GetMotionMaster()->Clear(false);
         GetMotionMaster()->MoveIdle();
+        StopMoving();
 
         if (charmer->GetTypeId() == TYPEID_PLAYER &&
             charmer->getClass() == CLASS_WARLOCK)