From 4ace6f58c69f00c650655de9f2f5e60659a686d1 Mon Sep 17 00:00:00 2001 From: Hondacrx Date: Sun, 8 Jun 2025 15:16:08 -0400 Subject: [PATCH] Core/Auras: Fixed SPELL_ATTR1_IMMUNITY_TO_HOSTILE_AND_FRIENDLY_EFFECTS logic - no longer incorrectly unapplies all auras for immunities that don't use it Port From (https://github.com/TrinityCore/TrinityCore/commit/107ca37c6816aa53460b8d3200bfe45cc4c5e3aa) --- Source/Game/Entities/Unit/Unit.Spells.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Game/Entities/Unit/Unit.Spells.cs b/Source/Game/Entities/Unit/Unit.Spells.cs index d5169729a..0be643ada 100644 --- a/Source/Game/Entities/Unit/Unit.Spells.cs +++ b/Source/Game/Entities/Unit/Unit.Spells.cs @@ -1393,7 +1393,7 @@ namespace Game.Entities if (immuneSpellInfo == null || !immuneSpellInfo.HasAttribute(SpellAttr1.ImmunityPurgesEffect)) continue; - if (immuneSpellInfo != null && !immuneSpellInfo.HasAttribute(SpellAttr1.ImmunityToHostileAndFriendlyEffects) && caster != null && !caster.IsFriendlyTo(this)) + if (!(immuneSpellInfo != null && immuneSpellInfo.HasAttribute(SpellAttr1.ImmunityToHostileAndFriendlyEffects)) && caster != null && caster.IsFriendlyTo(this)) continue; if (spellInfo.CanPierceImmuneAura(immuneSpellInfo)) @@ -1569,7 +1569,7 @@ namespace Game.Entities if ((immuneAuraApply.GetMiscValue() & (int)spellInfo.GetSchoolMask()) == 0) // Check school continue; - if (spellInfo.HasAttribute(SpellAttr1.ImmunityToHostileAndFriendlyEffects) || (caster != null && !IsFriendlyTo(caster))) // Harmful + if (immuneAuraApply.GetSpellInfo().HasAttribute(SpellAttr1.ImmunityToHostileAndFriendlyEffects) || (caster != null && !IsFriendlyTo(caster))) // Harmful return true; } }