From 1dd2236a0693e202eef8510c15a3a678afad0e5c Mon Sep 17 00:00:00 2001
From: sigman <sigman@ioupg.com>
Date: Thu, 14 May 2026 02:49:29 -0700
Subject: [PATCH] fix(Scripts/Spells): Fix 'still in combat' status after
 hunter tames a beast (in quest) (#25811)

---
 src/server/scripts/Spells/spell_hunter.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp
index a7147d3282..ece192038b 100644
--- a/src/server/scripts/Spells/spell_hunter.cpp
+++ b/src/server/scripts/Spells/spell_hunter.cpp
@@ -313,6 +313,7 @@ class spell_hun_taming_the_beast : public AuraScript
             if (Creature* creature = target->ToCreature())
             {
                 creature->GetThreatMgr().ClearAllThreat();
+                creature->GetCombatManager().EndAllCombat();
             }
         }
     }