sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core/Spells): Fixed some damage overflows during resilience calculations. (#11497)

Browse Source
This commit is contained in:
UltraNix
2022-04-24 05:39:21 +02:00
committed by GitHub
parent 336166c83e
commit 34c8f9a020
2 changed files with 58 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Auras/SpellAuraEffects.cpp
+18 -8
View File
@@ -6352,16 +6352,21 @@ void AuraEffect::HandlePeriodicDamageAurasTick(Unit* target, Unit* caster) const
damage = target->CalculateAOEDamageReduction(damage, GetSpellInfo()->SchoolMask, caster);
}
int32 dmg = damage;
int32 mitigatedDamage = cleanDamage.mitigated_damage;
if (CanApplyResilience())
{
int32 resilienceReduction = damage;
int32 resilienceReduction = dmg;
Unit::ApplyResilience(target, nullptr, &resilienceReduction, crit, CR_CRIT_TAKEN_SPELL);
resilienceReduction = damage - resilienceReduction;
damage -= resilienceReduction;
cleanDamage.mitigated_damage += resilienceReduction;
resilienceReduction = dmg - resilienceReduction;
dmg -= resilienceReduction;
mitigatedDamage += resilienceReduction;
}
damage = std::max(0, dmg);
cleanDamage.mitigated_damage = std::max(0, mitigatedDamage);
DamageInfo dmgInfo(caster, target, damage, GetSpellInfo(), GetSpellInfo()->GetSchoolMask(), DOT, cleanDamage.mitigated_damage);
Unit::CalcAbsorbResist(dmgInfo);
@@ -6433,16 +6438,21 @@ void AuraEffect::HandlePeriodicHealthLeechAuraTick(Unit* target, Unit* caster) c
damage = damageReductedArmor;
}
int32 dmg = damage;
int32 cleanDamageAmount = cleanDamage.mitigated_damage;
if (CanApplyResilience())
{
int32 resilienceReduction = damage;
int32 resilienceReduction = dmg;
Unit::ApplyResilience(target, nullptr, &resilienceReduction, crit, CR_CRIT_TAKEN_SPELL);
resilienceReduction = damage - resilienceReduction;
damage -= resilienceReduction;
cleanDamage.mitigated_damage += resilienceReduction;
resilienceReduction = dmg - resilienceReduction;
dmg -= resilienceReduction;
cleanDamageAmount += resilienceReduction;
}
damage = std::max(0, dmg);
cleanDamage.mitigated_damage = std::max(0, cleanDamageAmount);
DamageInfo dmgInfo(caster, target, damage, GetSpellInfo(), GetSpellInfo()->GetSchoolMask(), DOT, cleanDamage.mitigated_damage);
Unit::CalcAbsorbResist(dmgInfo);