From b638d446936ed8a329de2bbf3c825ce932b059f3 Mon Sep 17 00:00:00 2001
From: UltraNix <80540499+UltraNix@users.noreply.github.com>
Date: Mon, 23 May 2022 11:04:27 +0200
Subject: [PATCH] fix(Core/Units): Clear any movement on charm. (#11826)

Fixes #10343
---
 src/server/game/Entities/Unit/Unit.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 1ad0ef123..aa6f0891a 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -17930,14 +17930,7 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* au
 
     if (GetTypeId() == TYPEID_UNIT)
     {
-        if (MovementGenerator* movementGenerator = GetMotionMaster()->GetMotionSlot(MOTION_SLOT_IDLE))
-        {
-            movementGenerator->Pause(0);
-        }
-
-        GetMotionMaster()->Clear(MOTION_SLOT_ACTIVE);
-
-        StopMoving();
+        GetMotionMaster()->MoveIdle();
 
         if (charmer->GetTypeId() == TYPEID_PLAYER &&
             charmer->getClass() == CLASS_WARLOCK)