From 9840d54ef4b5f8d61c3856515fd6daa00143a5fe Mon Sep 17 00:00:00 2001 From: blinkysc <37940565+blinkysc@users.noreply.github.com> Date: Sat, 21 Mar 2026 07:37:20 -0500 Subject: [PATCH] fix(Core/Combat): Fire OnPlayerLeaveCombat hook from CombatManager exit path (#25137) Co-authored-by: blinkysc --- src/server/game/Combat/CombatManager.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/server/game/Combat/CombatManager.cpp b/src/server/game/Combat/CombatManager.cpp index 64ba173e7..60bcd77be 100644 --- a/src/server/game/Combat/CombatManager.cpp +++ b/src/server/game/Combat/CombatManager.cpp @@ -427,6 +427,9 @@ bool CombatManager::UpdateOwnerCombatState() const _owner->AtExitCombat(); if (!_owner->IsCreature()) _owner->AtDisengage(); + + if (Player* player = _owner->ToPlayer()) + sScriptMgr->OnPlayerLeaveCombat(player); } if (Unit* master = _owner->GetCharmerOrOwner())