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/Kalimdor | |
| parent | 3ca9e1253a127daea2ff1b8b0eb5236aa04f772e (diff) | |
Scripts/Spells: Added spell effect validation helper
Diffstat (limited to 'src/server/scripts/Kalimdor')
| -rw-r--r-- | src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp | 6 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp index 1075a2991db..c6c14c1b914 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp @@ -416,10 +416,8 @@ class spell_baleroc_decimating_strike : public SpellScript bool Validate(SpellInfo const* spellInfo) override { - if (spellInfo->GetEffects().size() <= EFFECT_2) - return false; - SpellEffectInfo const& spellEffectInfo = spellInfo->GetEffect(EFFECT_2); - return ValidateSpellInfo({ uint32(spellEffectInfo.CalcValue()) }); + return ValidateSpellEffect({ { spellInfo->Id, EFFECT_2 } }) + && ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_2).CalcValue()) }); } void ChangeDamage() diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp index a73bc730ae3..995e560f597 100644 --- a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp @@ -34,7 +34,8 @@ class spell_ooze_zap : public SpellScript bool Validate(SpellInfo const* spellInfo) override { - return spellInfo->GetEffects().size() > EFFECT_1 && ValidateSpellInfo({ SPELL_OOZE_ZAP }); + return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }) + && ValidateSpellInfo({ SPELL_OOZE_ZAP }); } SpellCastResult CheckRequirement() |