Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Scripts: fix some spells double dipping from done/taken bonuses

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/bb7869b31fc2fe6eb8cd9552249fea028d08316a)
This commit is contained in:
hondacrx
2021-06-23 12:01:41 -04:00
parent 9fd7c12094
commit 6dabdfa3ed
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Scripts/Spells/Druid.cs
+1 -8
View File
@@ -717,13 +717,9 @@ namespace Scripts.Spells.Druid
void OnRemoveEffect(Unit target, AuraEffect aurEff, uint stack) void OnRemoveEffect(Unit target, AuraEffect aurEff, uint stack)
{ {
uint healAmount = (uint)aurEff.GetAmount();
Unit caster = GetCaster(); Unit caster = GetCaster();
if (caster != null) 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 // restore mana
var spellPowerCostList = GetSpellInfo().CalcPowerCost(caster, GetSpellInfo().GetSchoolMask()); var spellPowerCostList = GetSpellInfo().CalcPowerCost(caster, GetSpellInfo().GetSchoolMask());
var spellPowerCost = spellPowerCostList.Find(cost => cost.Power == PowerType.Mana); var spellPowerCost = spellPowerCostList.Find(cost => cost.Power == PowerType.Mana);
@@ -736,10 +732,7 @@ namespace Scripts.Spells.Druid
} }
} }
CastSpellExtraArgs args = new(aurEff); target.CastSpell(target, SpellIds.LifebloomFinalHeal, new CastSpellExtraArgs(aurEff, GetCasterGUID()));
args.OriginalCaster = GetCasterGUID();
args.AddSpellMod(SpellValueMod.BasePoint0, (int)healAmount);
target.CastSpell(target, SpellIds.LifebloomFinalHeal, args);
} }
void AfterRemove(AuraEffect aurEff, AuraEffectHandleModes mode) void AfterRemove(AuraEffect aurEff, AuraEffectHandleModes mode)