From f8a6a9b01713a5dbe5ed38bd3d1b1c72191cf288 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 30 May 2023 19:34:19 +0200 Subject: Scripts/Spells: Added spell effect validation helper --- src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp | 2 +- src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/scripts/Outland') diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 9a0f3bda655..46ca46eecae 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -248,7 +248,7 @@ class spell_mother_shahraz_saber_lash : public AuraScript bool Validate(SpellInfo const* spellInfo) override { - return spellInfo->GetEffects().size() > EFFECT_1 + return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_1).TriggerSpell }); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 31a73111749..bc047abe423 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -483,7 +483,7 @@ class spell_astromancer_wrath_of_the_astromancer : public AuraScript bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ SPELL_WRATH_OF_THE_ASTROMANCER_DOT }) - && spellInfo->GetEffects().size() > EFFECT_1; + && ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }); } void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) -- cgit v1.2.3