diff options
| author | Shauren <shauren.trinity@gmail.com> | 2023-05-30 19:34:19 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2023-05-30 19:34:19 +0200 |
| commit | f8a6a9b01713a5dbe5ed38bd3d1b1c72191cf288 (patch) | |
| tree | df08545ca3a3f662df04779258c1591b43fc044b /src/server/scripts/Northrend | |
| parent | 3ca9e1253a127daea2ff1b8b0eb5236aa04f772e (diff) | |
Scripts/Spells: Added spell effect validation helper
Diffstat (limited to 'src/server/scripts/Northrend')
4 files changed, 5 insertions, 4 deletions
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 29da69b4b16..e2ca321494e 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -1026,7 +1026,7 @@ class spell_putricide_ooze_tank_protection : public AuraScript bool Validate(SpellInfo const* spellInfo) override { - return spellInfo->GetEffects().size() > EFFECT_1 + return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell, spellInfo->GetEffect(EFFECT_1).TriggerSpell }); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index b6d5cbe6ae2..a693250358f 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -492,7 +492,8 @@ class spell_rotface_mutated_infection_aura : public AuraScript bool Validate(SpellInfo const* spellInfo) override { - return spellInfo->GetEffects().size() > EFFECT_2 && ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_2).CalcValue()) }); + return ValidateSpellEffect({ { spellInfo->Id, EFFECT_2 } }) + && ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_2).CalcValue()) }); } void HandleEffectRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index c7f60b6e853..2ffe0a3fbdb 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1438,7 +1438,7 @@ class spell_frostwarden_handler_focus_fire_aura : public AuraScript bool Validate(SpellInfo const* spellInfo) override { - return spellInfo->GetEffects().size() > EFFECT_1; + return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }); } void PeriodicTick(AuraEffect const* /*aurEff*/) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index b6e0a91fd12..946c5c004f3 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -455,7 +455,7 @@ class spell_ulduar_cancel_stone_grip : public SpellScriptLoader bool Validate(SpellInfo const* spellInfo) override { - return spellInfo->GetEffects().size() > EFFECT_1; + return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }); } void HandleScript(SpellEffIndex /*effIndex*/) |