From e1492bc0e9906ed62aa455bd8fbcde92e12c526d Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Mon, 7 Aug 2023 19:29:31 +0200 Subject: [PATCH] Core/Spells: removed unnecessary spell attribute hack from Earth Shield and cleaned up its spell script a bit --- src/server/game/Spells/SpellMgr.cpp | 6 ------ src/server/scripts/Spells/spell_shaman.cpp | 8 +++----- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index f8162e76b6..b3acd2e291 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -5433,12 +5433,6 @@ void SpellMgr::LoadSpellInfoCorrections() spellInfo->Effects[EFFECT_1].ApplyAuraName = SPELL_AURA_OVERRIDE_ACTIONBAR_SPELLS; }); - // Earth Shield - ApplySpellFix({ 379 }, [](SpellInfo* spellInfo) - { - spellInfo->AttributesEx3 |= SPELL_ATTR3_IGNORE_CASTER_MODIFIERS; - }); - // Light of Dawn ApplySpellFix({ 85222 }, [](SpellInfo* spellInfo) { diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index e762f594fb..097fe03e85 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -278,17 +278,15 @@ class spell_sha_earth_shield : public AuraScript void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); - Unit* caster = GetCaster(); if (!caster) return; - Unit* target = GetTarget(); - int32 basePoints = caster->SpellHealingBonusDone(target, GetSpellInfo(), aurEff->GetAmount(), HEAL, EFFECT_0); + int32 bp = caster->SpellHealingBonusDone(GetTarget(), GetSpellInfo(), aurEff->GetAmount(), HEAL, aurEff->GetEffIndex()); if (AuraEffect const* glyphEff = caster->GetDummyAuraEffect(SPELLFAMILY_SHAMAN, SHAMAN_ICON_ID_GLYPH_OF_EARTH_SHIELD, EFFECT_0)) - AddPct(basePoints, glyphEff->GetAmount()); + AddPct(bp, glyphEff->GetAmount()); - target->CastSpell(target, SPELL_SHAMAN_EARTH_SHIELD_HEAL, CastSpellExtraArgs(aurEff).SetOriginalCaster(GetCasterGUID()).AddSpellBP0(basePoints)); + GetTarget()->CastSpell(GetTarget(), SPELL_SHAMAN_EARTH_SHIELD_HEAL, CastSpellExtraArgs(aurEff).SetOriginalCaster(GetCasterGUID()).AddSpellBP0(bp)); } void Register() override