From 20c8698bc467d493463c5afbced910d11d3b71b3 Mon Sep 17 00:00:00 2001 From: Gildor Date: Mon, 9 Aug 2021 22:36:14 +0200 Subject: Scripts/World: improve Training Dummy script (#26778) (cherry picked from commit c7ae9d761a3c9a7523d4bd195979f294f8c9e7cd) --- src/server/scripts/World/npcs_special.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 464705fea2e..e62d7cdcdf6 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -1461,11 +1461,16 @@ struct npc_training_dummy : NullCreatureAI { npc_training_dummy(Creature* creature) : NullCreatureAI(creature) { } - void DamageTaken(Unit* attacker, uint32& damage, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) override + void JustEnteredCombat(Unit* who) override + { + _combatTimer[who->GetGUID()] = 5s; + } + + void DamageTaken(Unit* attacker, uint32& damage, DamageEffectType damageType, SpellInfo const* /*spellInfo = nullptr*/) override { damage = 0; - if (!attacker) + if (!attacker || damageType == DOT) return; _combatTimer[attacker->GetGUID()] = 5s; -- cgit v1.2.3