From 27df6344d91399da51e1328634eca9d9f83b864b Mon Sep 17 00:00:00 2001
From: Mink80 <46659983+Mink80@users.noreply.github.com>
Date: Wed, 27 Sep 2023 22:24:46 +0200
Subject: [PATCH] fix: Optimizes redundant spell damage logic

---
 Projects/UOContent/Spells/Base/SpellHelper.cs | 40 +++++++------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/Projects/UOContent/Spells/Base/SpellHelper.cs b/Projects/UOContent/Spells/Base/SpellHelper.cs
index 90299d3f8..e94edbdcc 100644
--- a/Projects/UOContent/Spells/Base/SpellHelper.cs
+++ b/Projects/UOContent/Spells/Base/SpellHelper.cs
@@ -1130,32 +1130,20 @@ namespace Server.Spells
 
             protected override void OnTick()
             {
-                var bcFrom = m_From as BaseCreature;
-                var bcTarg = m_Target as BaseCreature;
-
-                if (m_Target != null)
-                {
-                    bcFrom?.AlterSpellDamageTo(m_Target, ref m_Damage);
-                }
-
-                if (m_From != null)
-                {
-                    bcTarg?.AlterSpellDamageFrom(m_From, ref m_Damage);
-                }
-
-                StaminaSystem.DFA = m_DFA;
-
-                var damageGiven = AOS.Damage(m_Target, m_From, m_Damage, m_Phys, m_Fire, m_Cold, m_Pois, m_Nrgy, m_Chaos);
-
-                StaminaSystem.DFA = DFAlgorithm.Standard;
-
-                bcFrom?.OnDamageSpell(m_Target, damageGiven);
-
-                if (m_From != null)
-                {
-                    bcTarg?.OnHarmfulSpell(m_From);
-                    bcTarg?.OnDamagedBySpell(m_From, damageGiven);
-                }
+                Damage(
+                    m_Spell,
+                    TimeSpan.Zero,
+                    m_Target,
+                    m_From,
+                    m_Damage,
+                    m_Phys,
+                    m_Fire,
+                    m_Cold,
+                    m_Pois,
+                    m_Nrgy,
+                    m_Chaos,
+                    m_DFA
+                );
 
                 m_Spell?.RemoveDelayedDamageContext(m_Target);
             }