nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-16 18:40:28 +00:00
Code Issues 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

69
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -1254,13 +1254,13 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage* damageInfo, int32 dama
// Script Hook For CalculateSpellDamageTaken -- Allow scripts to change the Damage post class mitigation calculations
sScriptMgr->ModifySpellDamageTaken(damageInfo->target, damageInfo->attacker, damage);
int32 cleanDamage = 0;
if (Unit::IsDamageReducedByArmor(damageSchoolMask, spellInfo))
{
damageInfo->damage = Unit::CalcArmorReducedDamage(this, victim, damage, spellInfo, 0, attackType);
damageInfo->cleanDamage += damage - damageInfo->damage;
int32 oldDamage = damage;
damage = Unit::CalcArmorReducedDamage(this, victim, damage, spellInfo, 0, attackType);
cleanDamage = oldDamage - damage;
}
else
damageInfo->damage = damage;
bool blocked = false;
// Per-school calc
@@ -1282,11 +1282,11 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage* damageInfo, int32 dama
damageInfo->HitInfo |= SPELL_HIT_TYPE_CRIT;
// Calculate crit bonus
uint32 crit_bonus = damageInfo->damage;
uint32 crit_bonus = damage;
// Apply crit_damage bonus for melee spells
if (Player* modOwner = GetSpellModOwner())
modOwner->ApplySpellMod(spellInfo->Id, SPELLMOD_CRIT_DAMAGE_BONUS, crit_bonus);
damageInfo->damage += crit_bonus;
damage += crit_bonus;
// Apply SPELL_AURA_MOD_ATTACKER_RANGED_CRIT_DAMAGE or SPELL_AURA_MOD_ATTACKER_MELEE_CRIT_DAMAGE
float critPctDamageMod = 0.0f;
@@ -1302,7 +1302,7 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage* damageInfo, int32 dama
critPctDamageMod += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_CRIT_PERCENT_VERSUS, crTypeMask);
if (critPctDamageMod != 0)
AddPct(damageInfo->damage, critPctDamageMod);
AddPct(damage, critPctDamageMod);
}
// Spell weapon based damage CAN BE crit & blocked at same time
@@ -1315,22 +1315,26 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage* damageInfo, int32 dama
if (damage < int32(damageInfo->blocked))
damageInfo->blocked = uint32(damage);
damageInfo->damage -= damageInfo->blocked;
damageInfo->cleanDamage += damageInfo->blocked;
damage -= damageInfo->blocked;
cleanDamage += damageInfo->blocked;
}
int32 resilienceReduction = damageInfo->damage;
int32 resilienceReduction = damage;
if (CanApplyResilience())
{
if (attackType != RANGED_ATTACK)
{
Unit::ApplyResilience(victim, nullptr, &resilienceReduction, crit, CR_CRIT_TAKEN_MELEE);
}
else
{
Unit::ApplyResilience(victim, nullptr, &resilienceReduction, crit, CR_CRIT_TAKEN_RANGED);
}
}
resilienceReduction = damageInfo->damage - resilienceReduction;
damageInfo->damage -= resilienceReduction;
damageInfo->cleanDamage += resilienceReduction;
resilienceReduction = damage - resilienceReduction;
damage -= resilienceReduction;
cleanDamage += resilienceReduction;
break;
}
// Magical Attacks
@@ -1341,24 +1345,29 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage* damageInfo, int32 dama
if (crit)
{
damageInfo->HitInfo |= SPELL_HIT_TYPE_CRIT;
damageInfo->damage = Unit::SpellCriticalDamageBonus(this, spellInfo, damageInfo->damage, victim);
damage = Unit::SpellCriticalDamageBonus(this, spellInfo, damage, victim);
}
int32 resilienceReduction = damageInfo->damage;
int32 resilienceReduction = damage;
if (CanApplyResilience())
{
Unit::ApplyResilience(victim, nullptr, &resilienceReduction, crit, CR_CRIT_TAKEN_SPELL);
}
resilienceReduction = damageInfo->damage - resilienceReduction;
damageInfo->damage -= resilienceReduction;
damageInfo->cleanDamage += resilienceReduction;
resilienceReduction = damage - resilienceReduction;
damage -= resilienceReduction;
cleanDamage += resilienceReduction;
break;
}
default:
break;
}
damageInfo->cleanDamage = std::max(0, cleanDamage);
damageInfo->damage = std::max(0, damage);
// Calculate absorb resist
if (int32(damageInfo->damage) > 0)
if (damageInfo->damage > 0)
{
DamageInfo dmgInfo(*damageInfo, SPELL_DIRECT_DAMAGE);
Unit::CalcAbsorbResist(dmgInfo);
@@ -1366,8 +1375,6 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage* damageInfo, int32 dama
damageInfo->resist = dmgInfo.GetResist();
damageInfo->damage = dmgInfo.GetDamage();
}
else
damageInfo->damage = 0;
}
void Unit::DealSpellDamage(SpellNonMeleeDamage* damageInfo, bool durabilityLoss, Spell const* spell /*= nullptr*/)
@@ -1578,18 +1585,24 @@ void Unit::CalculateMeleeDamage(Unit* victim, uint32 damage, CalcDamageInfo* dam
if (!(damageInfo->HitInfo & HITINFO_MISS))
damageInfo->HitInfo |= HITINFO_AFFECTS_VICTIM;
int32 resilienceReduction = damageInfo->damage;
// attackType is checked already for BASE_ATTACK or OFF_ATTACK so it can't be RANGED_ATTACK here
int32 dmg = damageInfo->damage;
int32 cleanDamage = damageInfo->cleanDamage;
if (CanApplyResilience())
{
int32 resilienceReduction = dmg;
Unit::ApplyResilience(victim, nullptr, &resilienceReduction, (damageInfo->hitOutCome == MELEE_HIT_CRIT), CR_CRIT_TAKEN_MELEE);
resilienceReduction = damageInfo->damage - resilienceReduction;
damageInfo->damage -= resilienceReduction;
damageInfo->cleanDamage += resilienceReduction;
resilienceReduction = dmg - resilienceReduction;
dmg -= resilienceReduction;
cleanDamage += resilienceReduction;
}
damageInfo->damage = std::max(0, dmg);
damageInfo->cleanDamage = std::max(0, cleanDamage);
// Calculate absorb resist
if (int32(damageInfo->damage) > 0)
if (damageInfo->damage > 0)
{
damageInfo->procVictim |= PROC_FLAG_TAKEN_DAMAGE;
// Calculate absorb & resists
@@ -1610,8 +1623,6 @@ void Unit::CalculateMeleeDamage(Unit* victim, uint32 damage, CalcDamageInfo* dam
damageInfo->damage = dmgInfo.GetDamage();
}
else // Impossible get negative result but....
damageInfo->damage = 0;
}
void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss)