From b078285a1249ba60805e064b88f8d2fb6137c285 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Mon, 30 May 2022 13:07:57 -0400
Subject: [PATCH] Entities/Unit: Fixed wrong combat stop when remove charm

Port From (https://github.com/TrinityCore/TrinityCore/commit/7de20bcc1cab0c069b67840be5d648fda297d641)
---
 Source/Game/Entities/Unit/Unit.Pets.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Game/Entities/Unit/Unit.Pets.cs b/Source/Game/Entities/Unit/Unit.Pets.cs
index 627108568..baccc9ae7 100644
--- a/Source/Game/Entities/Unit/Unit.Pets.cs
+++ b/Source/Game/Entities/Unit/Unit.Pets.cs
@@ -460,7 +460,7 @@ namespace Game.Entities
                 type = CharmType.Charm;
 
             CastStop();
-            CombatStop(); // @todo CombatStop(true) may cause crash (interrupt spells)
+            AttackStop();
 
             if (_oldFactionId != 0)
             {