From 86285f25311c095c9d58850adeadc12bfe82189a Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 14 Jun 2022 18:00:07 -0400 Subject: [PATCH] Scripts/Spells: Update and fix Druid Survival Instincts script Port From (https://github.com/TrinityCore/TrinityCore/commit/cac5b22f455e2c9f24bf71fd51d8c2a06019bf89) --- Source/Scripts/Spells/Druid.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Source/Scripts/Spells/Druid.cs b/Source/Scripts/Spells/Druid.cs index 3e032d260..07916d0c9 100644 --- a/Source/Scripts/Spells/Druid.cs +++ b/Source/Scripts/Spells/Druid.cs @@ -972,15 +972,18 @@ namespace Scripts.Spells.Druid void AfterApply(AuraEffect aurEff, AuraEffectHandleModes mode) { - Unit target = GetTarget(); - CastSpellExtraArgs args = new(aurEff); - args.AddSpellMod(SpellValueMod.BasePoint0, (int)target.CountPctFromMaxHealth(aurEff.GetAmount())); - target.CastSpell(target, SpellIds.SurvivalInstincts, args); + GetTarget().CastSpell(GetTarget(), SpellIds.SurvivalInstincts, true); + } + + void AfterRemove(AuraEffect aurEff, AuraEffectHandleModes mode) + { + GetTarget().RemoveAurasDueToSpell(SpellIds.SurvivalInstincts); } public override void Register() { - AfterEffectApply.Add(new EffectApplyHandler(AfterApply, 0, AuraType.Dummy, AuraEffectHandleModes.ChangeAmountMask)); + AfterEffectApply.Add(new EffectApplyHandler(AfterApply, 0, AuraType.Dummy, AuraEffectHandleModes.Real)); + AfterEffectRemove.Add(new EffectApplyHandler(AfterRemove, 0, AuraType.Dummy, AuraEffectHandleModes.Real)); } }