From 092fc7cc9e97566212df9f98febb810b64e12d58 Mon Sep 17 00:00:00 2001
From: blinkysc <37940565+blinkysc@users.noreply.github.com>
Date: Thu, 23 Apr 2026 03:46:08 -0500
Subject: [PATCH] fix(Core/AI): keep charmed creature victim set by charmer
 (#25552)

---
 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 345ee7ad7..4dfeb897c 100644
--- a/src/server/game/AI/CreatureAI.cpp
+++ b/src/server/game/AI/CreatureAI.cpp
@@ -358,6 +358,10 @@ bool CreatureAI::UpdateVictim()
         return false;
     }
 
+    // Charmed creatures: the charmer controls target selection, don't interfere
+    if (me->IsCharmed())
+        return me->GetVictim() != nullptr;
+
     if (!me->HasReactState(REACT_PASSIVE))
     {
         if (Unit* victim = me->SelectVictim())