From f1cb5cc71bc9577ceadcddfd0855ab15dbf15751 Mon Sep 17 00:00:00 2001
From: Andrew <47818697+Nyeriah@users.noreply.github.com>
Date: Tue, 2 Sep 2025 20:15:40 -0300
Subject: [PATCH] =?UTF-8?q?fix(Core/SAI):=20Remove=20combat=20flag=20on=20?=
 =?UTF-8?q?evade=20for=20SAI-scripted=20charmed=20u=E2=80=A6=20(#22775)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 4c2b252e2..f7e30d339 100644
--- a/src/server/game/AI/SmartScripts/SmartAI.cpp
+++ b/src/server/game/AI/SmartScripts/SmartAI.cpp
@@ -660,6 +660,7 @@ void SmartAI::EnterEvadeMode(EvadeReason /*why*/)
     if (me->GetCharmerGUID().IsPlayer() || me->HasUnitFlag(UNIT_FLAG_POSSESSED))
     {
         me->AttackStop();
+        me->RemoveUnitFlag(UNIT_FLAG_IN_COMBAT);
         return;
     }