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