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

Core/Spells: Refactor heal absorb code

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/f25aceab282f1c3828015dec6af0505a82130674)
This commit is contained in:
hondacrx
2022-07-29 17:49:01 -04:00
parent 0affdfbda0
commit 16ce1fe55b
3 changed files with 54 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Unit/Unit.cs
+24 -5
View File
@@ -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
absorbAurEff.ChangeAmount(absorbAurEff.GetAmount() - currentAbsorb);
// Check if our aura is using amount to count damage
// Check if our aura is using amount to count heal
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;
}
}
}
}