From 71c2f0af46b3ccec8c3422534e4403f3650b757d Mon Sep 17 00:00:00 2001 From: Giacomo Pozzoni Date: Mon, 9 Aug 2021 17:00:34 +0200 Subject: Core/AI: Add DamageEffectType and SpellInfo parameters to UnitAI::DamageTaken (#26787) * Core/AI: Add DamageEffectType and SpellInfo parameters to UnitAI::DamageTaken * Update scripts (cherry picked from commit 0800ab20a8039620fd271a43c173c008af68c22a) --- src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp | 2 +- src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp | 2 +- src/server/scripts/Maelstrom/Stonecore/stonecore.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/scripts/Maelstrom') diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp index 8ae80f93c8b..4e0e280abc0 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp @@ -110,7 +110,7 @@ class boss_ozruk : public CreatureScript BossAI::JustSummoned(summon); } - void DamageTaken(Unit* /*attacker*/, uint32 &damage) override + void DamageTaken(Unit* /*attacker*/, uint32 &damage, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) override { if (!me->HealthBelowPctDamaged(25, damage) || me->HasAura(SPELL_ENRAGE)) return; diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp index 5bb168d4ffc..b2c798bd8d0 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp @@ -146,7 +146,7 @@ class boss_slabhide : public CreatureScript events.ScheduleEvent(EVENT_AIR_PHASE, 10s); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) override + void DamageTaken(Unit* /*attacker*/, uint32& damage, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) override { if (_isFlying && damage >= me->GetHealth()) damage = me->GetHealth() - 1; // Let creature health fall to 1 hp but prevent it from dying during air phase. diff --git a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp index cfc60d7b494..76c33e3b73d 100644 --- a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp @@ -117,7 +117,7 @@ class npc_sc_millhouse_manastorm : public CreatureScript events.ScheduleEvent(EVENT_FEAR, 8s); } - void DamageTaken(Unit* /*attacker*/, uint32& damage) override + void DamageTaken(Unit* /*attacker*/, uint32& damage, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) override { if (damage >= me->GetHealth()) damage = me->GetHealth() - 1; -- cgit v1.2.3