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

fix(Core/Unit): Ignore Armor Calculation for spells with SPELL_ATTR4_IGNORE_DAMAGE_TAKEN_MODIFIERS (#24592)

Browse Source
This commit is contained in:
Gultask
2026-02-03 20:30:11 -03:00
committed by GitHub
parent 871163b1cc
commit 0efc2b3179
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+1 -1
View File
@@ -1345,7 +1345,7 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage* damageInfo, int32 dama
} }
int32 cleanDamage = 0; int32 cleanDamage = 0;
if (Unit::IsDamageReducedByArmor(damageSchoolMask, spellInfo)) if (!spellInfo->HasAttribute(SPELL_ATTR4_IGNORE_DAMAGE_TAKEN_MODIFIERS) && Unit::IsDamageReducedByArmor(damageSchoolMask, spellInfo))
{ {
int32 oldDamage = damage; int32 oldDamage = damage;
damage = Unit::CalcArmorReducedDamage(this, victim, damage, spellInfo, 0, attackType); damage = Unit::CalcArmorReducedDamage(this, victim, damage, spellInfo, 0, attackType);
src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
+3 -3
View File
@@ -256,7 +256,7 @@ class spell_gluth_decimate : public SpellScript
return; 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) PrepareSpellScript(spell_gluth_decimate_damage)
void RecalculateDamage() void HandleDamage(SpellEffIndex /*effIndex*/)
{ {
Unit* target = GetHitUnit(); Unit* target = GetHitUnit();
if (!target) if (!target)
@@ -291,7 +291,7 @@ class spell_gluth_decimate_damage : public SpellScript
void Register() override void Register() override
{ {
OnHit += SpellHitFn(spell_gluth_decimate_damage::RecalculateDamage); OnEffectHitTarget += SpellEffectFn(spell_gluth_decimate_damage::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
} }
}; };