From 0f2841ddcf3e2e010ac187c9358ed45353ed9273 Mon Sep 17 00:00:00 2001 From: blinkysc <37940565+blinkysc@users.noreply.github.com> Date: Thu, 23 Apr 2026 17:58:16 -0500 Subject: [PATCH] fix(Core/Combat): Training dummy stuck combat after pet recall (#25565) Co-authored-by: blinkysc --- src/server/scripts/World/npcs_special.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 3e7ebb34e..0713d3600 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -329,6 +329,12 @@ struct npc_training_dummy : NullCreatureAI return; _combatTimer[attacker->GetGUID()] = 5s; + + // Pet attacks engage the owner via propagation without firing + // JustEnteredCombat here, so track the owner's timer too. + if (Unit* owner = attacker->GetCharmerOrOwner()) + if (me->GetCombatManager().IsInCombatWith(owner)) + _combatTimer[owner->GetGUID()] = 5s; } void UpdateAI(uint32 diff) override