diff --git a/data/sql/updates/pending_db_world/rev_1685547548027950300.sql b/data/sql/updates/pending_db_world/rev_1685547548027950300.sql new file mode 100644 index 0000000000..2ad93eeac0 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1685547548027950300.sql @@ -0,0 +1,6 @@ +-- +DELETE FROM `spell_script_names` WHERE `spell_id` IN (-49220, 34246, 60779) AND `ScriptName` IN ('spell_dru_idol_lifebloom', 'spell_dk_impurity'); +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(-49220, 'spell_dk_impurity'), +(34246, 'spell_dru_idol_lifebloom'), +(60779, 'spell_dru_idol_lifebloom'); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index e835febb3f..c9c3127d02 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -12465,32 +12465,6 @@ uint32 Unit::SpellHealingBonusDone(Unit* victim, SpellInfo const* spellProto, ui switch (spellProto->SpellFamilyName) { - case SPELLFAMILY_DRUID: - { - // Nourish vs Idol of the Flourishing Life - if (spellProto->SpellFamilyFlags[1] & 0x02000000) - { - if (AuraEffect const* relicAurEff = GetAuraEffect(64949, EFFECT_0)) - { - DoneAdvertisedBenefit += relicAurEff->GetAmount(); - } - } - - // Lifebloom vs Idol of Lush Moss/Increased Lifebloom Periodic - if (spellProto->SpellFamilyFlags[1] & 00000010) - { - if (AuraEffect const* relicAurEff = GetAuraEffect(60779, EFFECT_0)) - { - DoneAdvertisedBenefit += relicAurEff->GetAmount(); - } - - if (AuraEffect const* relicAurEff = GetAuraEffect(34246, EFFECT_0)) - { - DoneAdvertisedBenefit += relicAurEff->GetAmount(); - } - } - break; - } case SPELLFAMILY_DEATHKNIGHT: { // Impurity diff --git a/src/server/game/Spells/SpellInfoCorrections.cpp b/src/server/game/Spells/SpellInfoCorrections.cpp index e37231d024..cc3db3b01f 100644 --- a/src/server/game/Spells/SpellInfoCorrections.cpp +++ b/src/server/game/Spells/SpellInfoCorrections.cpp @@ -439,6 +439,13 @@ void SpellMgr::LoadSpellInfoCorrections() spellInfo->Effects[EFFECT_0].SpellClassMask = flag96(0x00000040, 0x00000000, 0x00000000); }); + // Idol of the Flourishing Life + ApplySpellFix({ 64949 }, [](SpellInfo* spellInfo) + { + spellInfo->Effects[EFFECT_0].SpellClassMask = flag96(0x00000000, 0x02000000, 0x00000000); + spellInfo->Effects[EFFECT_0].ApplyAuraName = SPELL_AURA_ADD_FLAT_MODIFIER; + }); + ApplySpellFix({ 34231, // Libram of the Lightbringer 60792, // Libram of Tolerance