diff options
| author | Shauren <shauren.trinity@gmail.com> | 2023-06-03 23:17:28 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2023-06-03 23:17:28 +0200 |
| commit | 622eed752bc69fc4c34bb568d96d51913258f852 (patch) | |
| tree | 48cefb31c08cd1654a3616295498cd336bb1b646 /src/server/scripts/Kalimdor | |
| parent | 277497fdf1ca5f7b310c4544e8f1304a66034884 (diff) | |
Scripts/Spells: Converted remaining spell scripts to use ValidateSpellEffect
Diffstat (limited to 'src/server/scripts/Kalimdor')
| -rw-r--r-- | src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp | 3 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_silithus.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp index c6c14c1b914..be6aee37e4d 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp @@ -797,8 +797,7 @@ class spell_baleroc_vital_flame : public AuraScript bool Validate(SpellInfo const* /*spellInfo*/) override { - return ValidateSpellInfo({ SPELL_VITAL_SPARK }) - && !sSpellMgr->AssertSpellInfo(SPELL_VITAL_SPARK, DIFFICULTY_NONE)->GetEffects().empty(); + return ValidateSpellEffect({ { SPELL_VITAL_SPARK, EFFECT_0 } }); } void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index fee121eb877..fd10c3eac56 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -1454,7 +1454,7 @@ class spell_silithus_summon_cultist_periodic : public AuraScript bool Validate(SpellInfo const* spellInfo) override { - return !spellInfo->GetEffects().empty() && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell }); + return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell }); } void PeriodicTick(AuraEffect const* aurEff) |