Core/Spells: Refactor heal absorb code

Port From (https://github.com/TrinityCore/TrinityCore/commit/f25aceab282f1c3828015dec6af0505a82130674)

Source/Game/Entities/Unit/Unit.cs

@@ -3593,6 +3593,9 @@ namespace Game.Entities
             if (healInfo.GetHeal() == 0)
                 return;
 
+            // Need remove expired auras after
+            bool existExpired = false;
+
             // absorb without mana cost
             var vHealAbsorb = healInfo.GetTarget().GetAuraEffectsByType(AuraType.SchoolHealAbsorb);
             for (var i = 0; i < vHealAbsorb.Count && healInfo.GetHeal() > 0; ++i)
@@ -3603,7 +3606,7 @@ namespace Game.Entities
                 if (aurApp == null)
                     continue;
 
-                if ((absorbAurEff.GetMiscValue() & (int)healInfo.GetSchoolMask()) == 0)
+                if ((absorbAurEff.GetMiscValue() & (int)healInfo.GetSpellInfo().GetSchoolMask()) == 0)
                     continue;
 
                 // get amount which can be still absorbed by the aura
@@ -3623,6 +3626,7 @@ namespace Game.Entities
                     continue;
 
                 // currentAbsorb - damage can be absorbed by shield
+                // If need absorb less damage
                 currentAbsorb = (int)Math.Min(healInfo.GetHeal(), currentAbsorb);
 
                 healInfo.AbsorbHeal((uint)currentAbsorb);
@@ -3630,16 +3634,31 @@ namespace Game.Entities
                 tempAbsorb = (uint)currentAbsorb;
                 absorbAurEff.GetBase().CallScriptEffectAfterAbsorbHandlers(absorbAurEff, aurApp, healInfo, ref tempAbsorb);
 
-                // Reduce shield amount
+                // Check if our aura is using amount to count heal
-                absorbAurEff.ChangeAmount(absorbAurEff.GetAmount() - currentAbsorb);
-                // Check if our aura is using amount to count damage
                 if (absorbAurEff.GetAmount() >= 0)
                 {
                     // Reduce shield amount
                     absorbAurEff.ChangeAmount(absorbAurEff.GetAmount() - currentAbsorb);
                     // Aura cannot absorb anything more - remove it
                     if (absorbAurEff.GetAmount() <= 0)
-                        absorbAurEff.GetBase().Remove(AuraRemoveMode.EnemySpell);
+                        existExpired = true;
+                }
+            }
+
+            // Remove all expired absorb auras
+            if (existExpired)
+            {
+                for (var i = 0; i < vHealAbsorb.Count;)
+                {
+                    AuraEffect auraEff = vHealAbsorb[i];
+                    ++i;
+                    if (auraEff.GetAmount() <= 0)
+                    {
+                        uint removedAuras = healInfo.GetTarget().m_removedAurasCount;
+                        auraEff.GetBase().Remove(AuraRemoveMode.EnemySpell);
+                        if (removedAuras + 1 < healInfo.GetTarget().m_removedAurasCount)
+                            i = 0;
+                    }
                 }
             }
         }

Source/Game/Scripting/SpellScript.cs

@@ -1559,16 +1559,16 @@ namespace Game.Scripting
         // where function is: void function (AuraEffect aurEff, DamageInfo& dmgInfo, uint& absorbAmount);
         public List<EffectAbsorbHandler> OnEffectAbsorb = new();
 
-        // executed when absorb aura effect is going to reduce damage
-        // example: OnEffectAbsorbHeal += AuraEffectAbsorbHealFn(class::function, EffectIndexSpecifier);
-        // where function is: void function (AuraEffect const* aurEff, HealInfo& healInfo, uint32& absorbAmount);
-        public List<EffectAbsorbHealHandler> OnEffectAbsorbHeal = new();
-
         // executed after absorb aura effect reduced damage to target - absorbAmount is real amount absorbed by aura
         // example: AfterEffectAbsorb += AuraEffectAbsorbFn(class.function, EffectIndexSpecifier);
         // where function is: void function (AuraEffect aurEff, DamageInfo& dmgInfo, uint& absorbAmount);
         public List<EffectAbsorbHandler> AfterEffectAbsorb = new();
 
+        // executed when absorb aura effect is going to reduce damage
+        // example: OnEffectAbsorbHeal += AuraEffectAbsorbHealFn(class::function, EffectIndexSpecifier);
+        // where function is: void function (AuraEffect const* aurEff, HealInfo& healInfo, uint32& absorbAmount);
+        public List<EffectAbsorbHealHandler> OnEffectAbsorbHeal = new();
+
         // executed after absorb aura effect reduced heal to target - absorbAmount is real amount absorbed by aura
         // example: AfterEffectAbsorbHeal += AuraEffectAbsorbHealFn(class::function, EffectIndexSpecifier);
         // where function is: void function (AuraEffect* aurEff, HealInfo& healInfo, uint32& absorbAmount);

Source/Game/Spells/Auras/Aura.cs

@@ -401,6 +401,16 @@ namespace Game.Spells
             }
         }
 
+        public virtual void Dispose()
+        {
+            // unload scripts
+            foreach (var itr in m_loadedScripts.ToList())
+                itr._Unload();
+
+            Cypher.Assert(m_applications.Empty());
+            _DeleteRemovedApplications();
+        }
+
         public Unit GetCaster()
         {
             if (m_owner.GetGUID() == m_casterGuid)
@@ -2141,20 +2151,6 @@ namespace Game.Spells
             }
         }
 
-        public void CallScriptEffectAbsorbHandlers(AuraEffect aurEff, AuraApplication aurApp, HealInfo healInfo, ref uint absorbAmount, ref bool defaultPrevented)
-        {
-            foreach (var auraScript in m_loadedScripts)
-            {
-                auraScript._PrepareScriptCall(AuraScriptHookType.EffectAbsorb, aurApp);
-                foreach (var eff in auraScript.OnEffectAbsorbHeal)
-                    if (eff.IsEffectAffected(m_spellInfo, aurEff.GetEffIndex()))
-                        eff.Call(aurEff, healInfo, ref absorbAmount);
-
-                defaultPrevented = auraScript._IsDefaultActionPrevented();
-                auraScript._FinishScriptCall();
-            }
-        }
-        
         public void CallScriptEffectAfterAbsorbHandlers(AuraEffect aurEff, AuraApplication aurApp, DamageInfo dmgInfo, ref uint absorbAmount)
         {
             foreach (var auraScript in m_loadedScripts)
@@ -2169,6 +2165,20 @@ namespace Game.Spells
             }
         }
 
+        public void CallScriptEffectAbsorbHandlers(AuraEffect aurEff, AuraApplication aurApp, HealInfo healInfo, ref uint absorbAmount, ref bool defaultPrevented)
+        {
+            foreach (var auraScript in m_loadedScripts)
+            {
+                auraScript._PrepareScriptCall(AuraScriptHookType.EffectAbsorb, aurApp);
+                foreach (var eff in auraScript.OnEffectAbsorbHeal)
+                    if (eff.IsEffectAffected(m_spellInfo, aurEff.GetEffIndex()))
+                        eff.Call(aurEff, healInfo, ref absorbAmount);
+
+                defaultPrevented = auraScript._IsDefaultActionPrevented();
+                auraScript._FinishScriptCall();
+            }
+        }
+
         public void CallScriptEffectAfterAbsorbHandlers(AuraEffect aurEff, AuraApplication aurApp, HealInfo healInfo, ref uint absorbAmount)
         {
             foreach (var auraScript in m_loadedScripts)