From fa9f28309b03f56ce3565b8397bb25e72dd2f25c Mon Sep 17 00:00:00 2001 From: blinkysc <37940565+blinkysc@users.noreply.github.com> Date: Sun, 22 Mar 2026 16:38:49 -0500 Subject: [PATCH] fix(Core/AI): Prevent guardians from switching targets on owner combat interaction (#25190) Co-authored-by: blinkysc --- src/server/game/AI/CreatureAI.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index 161d11b14..f8c69e141 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -198,6 +198,10 @@ void CreatureAI::OnOwnerCombatInteraction(Unit* target) if (!target || !me->IsAlive()) return; + // Prevent guardian from disengaging from current target + if (me->GetVictim() && me->GetVictim()->IsAlive()) + return; + if (!me->HasReactState(REACT_PASSIVE) && me->CanStartAttack(target, true)) AttackStart(target); }