From d23e61b7219d7bae1aea36a63b860372c9f00173 Mon Sep 17 00:00:00 2001
From: blinkysc <37940565+blinkysc@users.noreply.github.com>
Date: Sat, 26 Apr 2025 13:24:35 -0500
Subject: [PATCH] fix(SmartAI): Ensure immediate combat engagement (#21854)

NPCs will stop their current waypoint and start combat.
---
 src/server/game/AI/SmartScripts/SmartAI.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp
index 55ebd43d1..d48cf2681 100644
--- a/src/server/game/AI/SmartScripts/SmartAI.cpp
+++ b/src/server/game/AI/SmartScripts/SmartAI.cpp
@@ -848,6 +848,7 @@ void SmartAI::AttackStart(Unit* who)
             {
                 me->GetMotionMaster()->MovementExpired();
                 me->StopMoving();
+                me->GetMotionMaster()->Clear(false);
             }
 
             me->GetMotionMaster()->MoveChase(who);