Unit: Stop chasing the charmer to allow following him correctly after being charmed

deiteris · deiteris · commit 815a84df3c08 · 2023-11-03T16:38:02.000+02:00
diff --git a/src/game/Entities/Unit.cpp b/src/game/Entities/Unit.cpp
@@ -11300,6 +11300,10 @@ bool Unit::TakeCharmOf(Unit* charmed, uint32 spellId, bool advertised /*= true*/
         charmed->ClearInCombat();
     }
 
+    MotionMaster* mm = charmed->GetMotionMaster();
+    if (mm->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)
+        mm->MovementExpired();
+
     if (UnitAI* ai = charmed->AI())
         ai->JustGotCharmed(this);
 

Original file line number	Diff line number	Diff line change
`@@ -11300,6 +11300,10 @@ bool Unit::TakeCharmOf(Unit* charmed, uint32 spellId, bool advertised /= true/`
`11300`	`11300`	`charmed->ClearInCombat();`
`11301`	`11301`	`}`
`11302`	`11302`
	`11303`	`+ MotionMaster* mm = charmed->GetMotionMaster();`
	`11304`	`+ if (mm->GetCurrentMovementGeneratorType() == CHASE_MOTION_TYPE)`
	`11305`	`+ mm->MovementExpired();`
	`11306`	`+`
`11303`	`11307`	`if (UnitAI* ai = charmed->AI())`
`11304`	`11308`	`ai->JustGotCharmed(this);`
`11305`	`11309`