From fcce0355d5cb633289fc780bcff6fca6e2e718c4 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sat, 27 Feb 2021 13:50:00 +0100 Subject: [PATCH] Core/Spells: cleaned Earth Shield's spell script up --- src/server/scripts/Spells/spell_shaman.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index d3fd35376a2..f54fb4a646f 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -326,17 +326,16 @@ class spell_sha_earth_shield : public AuraScript { PreventDefaultAction(); - if (Unit* caster = GetCaster()) - { - Unit* target = GetTarget(); - int32 bp = aurEff->GetAmount(); - bp = caster->SpellHealingBonusDone(target, GetSpellInfo(), bp, HEAL, EFFECT_0); + Unit* caster = GetCaster(); + if (!caster) + return; - if (AuraEffect const* glyphEff = caster->GetDummyAuraEffect(SPELLFAMILY_SHAMAN, SHAMAN_ICON_ID_GLYPH_OF_EARTH_SHIELD, EFFECT_0)) - AddPct(bp, glyphEff->GetAmount()); + Unit* target = GetTarget(); + int32 basePoints = caster->SpellHealingBonusDone(target, GetSpellInfo(), aurEff->GetAmount(), HEAL, EFFECT_0); + if (AuraEffect const* glyphEff = caster->GetDummyAuraEffect(SPELLFAMILY_SHAMAN, SHAMAN_ICON_ID_GLYPH_OF_EARTH_SHIELD, EFFECT_0)) + AddPct(basePoints, glyphEff->GetAmount()); - target->CastSpell(target, SPELL_SHAMAN_EARTH_SHIELD_HEAL, CastSpellExtraArgs(aurEff).SetOriginalCaster(GetCasterGUID()).AddSpellBP0(bp)); - } + target->CastSpell(target, SPELL_SHAMAN_EARTH_SHIELD_HEAL, CastSpellExtraArgs(aurEff).SetOriginalCaster(GetCasterGUID()).AddSpellBP0(basePoints)); } void Register() override