From b69a918d9fcb6f69b6aab712759362a9e150ff20 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Fri, 7 Jan 2022 11:20:03 -0500
Subject: [PATCH] Core/AI: Fix remaining charming issue

Port From (https://github.com/TrinityCore/TrinityCore/commit/dab7e5688c55d4b785a9277d15ea55e075870849)
---
 Source/Game/AI/CoreAI/CreatureAI.cs    | 3 +++
 Source/Game/AI/SmartScripts/SmartAI.cs | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Source/Game/AI/CoreAI/CreatureAI.cs b/Source/Game/AI/CoreAI/CreatureAI.cs
index 97fa1ae65..df63c570c 100644
--- a/Source/Game/AI/CoreAI/CreatureAI.cs
+++ b/Source/Game/AI/CoreAI/CreatureAI.cs
@@ -57,6 +57,9 @@ namespace Game.AI
                         me.EngageWithTarget(lastCharmer);
                 }
                 me.LastCharmerGUID.Clear();
+
+                if (!me.IsInCombat())
+                    EnterEvadeMode(EvadeReason.NoHostiles);
             }
 
             base.OnCharmed(isNew);
diff --git a/Source/Game/AI/SmartScripts/SmartAI.cs b/Source/Game/AI/SmartScripts/SmartAI.cs
index 940389586..333fbae2e 100644
--- a/Source/Game/AI/SmartScripts/SmartAI.cs
+++ b/Source/Game/AI/SmartScripts/SmartAI.cs
@@ -760,6 +760,9 @@ namespace Game.AI
                             me.EngageWithTarget(lastCharmer);
                     }
                     me.LastCharmerGUID.Clear();
+
+                    if (!me.IsInCombat())
+                        EnterEvadeMode(EvadeReason.NoHostiles);
                 }
             }