From 1bb4dac282927429f65dfc85034b3f52d18253b2 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Mon, 30 May 2022 13:14:21 -0400
Subject: [PATCH] Core/Unit: Fixed wrong combat stop when set charm

Port From (https://github.com/TrinityCore/TrinityCore/commit/381c543c60a1394122af6e1130fb1278e98b0fe0)
---
 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 baccc9ae7..cc032db9b 100644
--- a/Source/Game/Entities/Unit/Unit.Pets.cs
+++ b/Source/Game/Entities/Unit/Unit.Pets.cs
@@ -309,7 +309,7 @@ namespace Game.Entities
             }
 
             CastStop();
-            CombatStop(); // @todo CombatStop(true) may cause crash (interrupt spells)
+            AttackStop();
 
             Player playerCharmer = charmer.ToPlayer();