From 81c81fb2408907332cbc272a974f8c9f12514207 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sun, 29 May 2022 20:36:06 -0400 Subject: [PATCH] Scripts/World: improve Training Dummy script Port From (https://github.com/TrinityCore/TrinityCore/commit/20c8698bc467d493463c5afbced910d11d3b71b3) --- Source/Scripts/World/NpcSpecial.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/Scripts/World/NpcSpecial.cs b/Source/Scripts/World/NpcSpecial.cs index d38c7caf8..57260d912 100644 --- a/Source/Scripts/World/NpcSpecial.cs +++ b/Source/Scripts/World/NpcSpecial.cs @@ -1315,11 +1315,16 @@ namespace Scripts.World.NpcSpecial public npc_training_dummy(Creature creature) : base(creature) { } + public override void JustEnteredCombat(Unit who) + { + _combatTimer[who.GetGUID()] = TimeSpan.FromSeconds(5); + } + public override void DamageTaken(Unit attacker, ref uint damage, DamageEffectType damageType, SpellInfo spellInfo = null) { damage = 0; - if (!attacker) + if (!attacker || damageType == DamageEffectType.DOT) return; _combatTimer[attacker.GetGUID()] = TimeSpan.FromSeconds(5);