From ba85a5ec9fb0634d17e32b4d0174a4c5318768ab Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Wed, 9 Oct 2019 13:59:25 +0200 Subject: [PATCH] Core/Spells: corrected a typo that was causing Earth Shield to gain additional spell power benefits from the heal target's spellpower --- sql/updates/world/custom/custom_2019_10_09_00_world.sql | 1 + src/server/game/Spells/SpellMgr.cpp | 2 +- src/server/scripts/Spells/spell_shaman.cpp | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 sql/updates/world/custom/custom_2019_10_09_00_world.sql diff --git a/sql/updates/world/custom/custom_2019_10_09_00_world.sql b/sql/updates/world/custom/custom_2019_10_09_00_world.sql new file mode 100644 index 00000000000..ed4ee370e2a --- /dev/null +++ b/sql/updates/world/custom/custom_2019_10_09_00_world.sql @@ -0,0 +1 @@ +DELETE FROM `spell_bonus_data` WHERE `entry`= 974; diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 0b1c182bcfc..bf9dabf2bfa 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -5545,7 +5545,7 @@ void SpellMgr::LoadSpellInfoCorrections() }); // Earth Shield - ApplySpellFix({ 378 }, [](SpellInfo* spellInfo) + ApplySpellFix({ 379 }, [](SpellInfo* spellInfo) { spellInfo->AttributesEx3 |= SPELL_ATTR3_NO_DONE_BONUS; }); diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 31352c248c8..b389d85dcb9 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -334,9 +334,9 @@ class spell_sha_earth_shield : public AuraScript { Unit* target = GetTarget(); int32 bp = aurEff->GetAmount(); - - bp = caster->SpellHealingBonusDone(target, GetSpellInfo(), bp, HEAL, aurEff->GetEffIndex()); + bp = caster->SpellHealingBonusDone(target, GetSpellInfo(), bp, HEAL, EFFECT_0); bp = target->SpellHealingBonusTaken(caster, GetSpellInfo(), bp, HEAL); + if (AuraEffect const* glyphEff = caster->GetDummyAuraEffect(SPELLFAMILY_SHAMAN, SHAMAN_ICON_ID_GLYPH_OF_EARTH_SHIELD, EFFECT_0)) AddPct(bp, glyphEff->GetAmount());