From 6dabdfa3edb2d5ae7e3bf641fd0d32ba84cdb30b Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 23 Jun 2021 12:01:41 -0400 Subject: [PATCH] Core/Scripts: fix some spells double dipping from done/taken bonuses Port From (https://github.com/TrinityCore/TrinityCore/commit/bb7869b31fc2fe6eb8cd9552249fea028d08316a) --- Source/Scripts/Spells/Druid.cs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Source/Scripts/Spells/Druid.cs b/Source/Scripts/Spells/Druid.cs index a4c09a826..4403b28d0 100644 --- a/Source/Scripts/Spells/Druid.cs +++ b/Source/Scripts/Spells/Druid.cs @@ -717,13 +717,9 @@ namespace Scripts.Spells.Druid void OnRemoveEffect(Unit target, AuraEffect aurEff, uint stack) { - uint healAmount = (uint)aurEff.GetAmount(); Unit caster = GetCaster(); if (caster != null) { - healAmount = caster.SpellHealingBonusDone(GetTarget(), GetSpellInfo(), healAmount, DamageEffectType.Heal, aurEff.GetSpellEffectInfo(), stack); - healAmount = GetTarget().SpellHealingBonusTaken(caster, GetSpellInfo(), healAmount, DamageEffectType.Heal, aurEff.GetSpellEffectInfo(), stack); - // restore mana var spellPowerCostList = GetSpellInfo().CalcPowerCost(caster, GetSpellInfo().GetSchoolMask()); var spellPowerCost = spellPowerCostList.Find(cost => cost.Power == PowerType.Mana); @@ -736,10 +732,7 @@ namespace Scripts.Spells.Druid } } - CastSpellExtraArgs args = new(aurEff); - args.OriginalCaster = GetCasterGUID(); - args.AddSpellMod(SpellValueMod.BasePoint0, (int)healAmount); - target.CastSpell(target, SpellIds.LifebloomFinalHeal, args); + target.CastSpell(target, SpellIds.LifebloomFinalHeal, new CastSpellExtraArgs(aurEff, GetCasterGUID())); } void AfterRemove(AuraEffect aurEff, AuraEffectHandleModes mode)