From e471087652754b426c895858daea74fce200f8b4 Mon Sep 17 00:00:00 2001
From: sogladev <sogladev@gmail.com>
Date: Tue, 3 Mar 2026 02:07:42 +0100
Subject: [PATCH] fix(Core/Movement): restore TimedFleeingMovementGenerator
 AttackStop (#24892)

Co-authored-by: megamage <none@none>
---
 .../MovementGenerators/FleeingMovementGenerator.cpp       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
index 45b14e1ae..06d9b474c 100644
--- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
@@ -240,7 +240,13 @@ void TimedFleeingMovementGenerator::Finalize(Unit* owner)
 
     if (Unit* victim = owner->GetVictim())
     {
-        owner->SetTarget(victim->GetGUID());
+        if (owner->IsAlive())
+        {
+            owner->AttackStop();
+            if (Creature* ownerCreature = owner->ToCreature())
+                if (CreatureAI* AI = ownerCreature->AI())
+                    AI->AttackStart(victim);
+        }
     }
 
     if (Creature* ownerCreature = owner->ToCreature())