mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2026-02-27 22:16:11 +00:00
fix(Core/Unit): Ignore Armor Calculation for spells with SPELL_ATTR4_IGNORE_DAMAGE_TAKEN_MODIFIERS (#24592)
This commit is contained in:
@@ -1345,7 +1345,7 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage* damageInfo, int32 dama
|
||||
}
|
||||
|
||||
int32 cleanDamage = 0;
|
||||
if (Unit::IsDamageReducedByArmor(damageSchoolMask, spellInfo))
|
||||
if (!spellInfo->HasAttribute(SPELL_ATTR4_IGNORE_DAMAGE_TAKEN_MODIFIERS) && Unit::IsDamageReducedByArmor(damageSchoolMask, spellInfo))
|
||||
{
|
||||
int32 oldDamage = damage;
|
||||
damage = Unit::CalcArmorReducedDamage(this, victim, damage, spellInfo, 0, attackType);
|
||||
|
||||
@@ -256,7 +256,7 @@ class spell_gluth_decimate : public SpellScript
|
||||
return;
|
||||
}
|
||||
|
||||
GetCaster()->CastSpell(unitTarget, SPELL_DECIMATE_DAMAGE);
|
||||
GetCaster()->CastSpell(unitTarget, SPELL_DECIMATE_DAMAGE, true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -271,7 +271,7 @@ class spell_gluth_decimate_damage : public SpellScript
|
||||
{
|
||||
PrepareSpellScript(spell_gluth_decimate_damage)
|
||||
|
||||
void RecalculateDamage()
|
||||
void HandleDamage(SpellEffIndex /*effIndex*/)
|
||||
{
|
||||
Unit* target = GetHitUnit();
|
||||
if (!target)
|
||||
@@ -291,7 +291,7 @@ class spell_gluth_decimate_damage : public SpellScript
|
||||
|
||||
void Register() override
|
||||
{
|
||||
OnHit += SpellHitFn(spell_gluth_decimate_damage::RecalculateDamage);
|
||||
OnEffectHitTarget += SpellEffectFn(spell_gluth_decimate_damage::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user