diff options
| author | Gildor <gildor55@gmail.com> | 2021-08-09 22:36:14 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-12 14:45:19 +0100 |
| commit | 20c8698bc467d493463c5afbced910d11d3b71b3 (patch) | |
| tree | c2e7646fa3c8cb31d28ab029205df82ad79dd8b6 /src/server/scripts/World | |
| parent | 71c2f0af46b3ccec8c3422534e4403f3650b757d (diff) | |
Scripts/World: improve Training Dummy script (#26778)
(cherry picked from commit c7ae9d761a3c9a7523d4bd195979f294f8c9e7cd)
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
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; |