From 034ebb3cdd34e86764d66570f2da3194f080ad61 Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Sat, 19 Oct 2024 15:53:24 -0300 Subject: [PATCH] =?UTF-8?q?Revert=20"fix(Core/Spells):=20SPELL=5FATTR1=5FI?= =?UTF-8?q?MMUNITY=5FPURGES=5FEFFECT=20should=20not=20remov=E2=80=A6"=20(#?= =?UTF-8?q?20245)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 572be7d69f8b9a0100d95ecaa045247e574c38a4. --- src/server/game/Entities/Unit/Unit.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 8e0f5667a..45f38d2fc 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -5122,9 +5122,6 @@ void Unit::RemoveAurasByType(AuraType auraType, ObjectGuid casterGUID, Aura* exc if (aura != except && (!casterGUID || aura->GetCasterGUID() == casterGUID) && ((negative && !aurApp->IsPositive()) || (positive && aurApp->IsPositive()))) { - if (aura->GetSpellInfo()->HasAttribute(SPELL_ATTR0_NO_IMMUNITIES)) - continue; - uint32 removedAuras = m_removedAurasCount; RemoveAura(aurApp); if (m_removedAurasCount > removedAuras + 1) @@ -5260,12 +5257,11 @@ void Unit::RemoveAurasWithMechanic(uint32 mechanic_mask, AuraRemoveMode removemo Aura const* aura = iter->second->GetBase(); if (!except || aura->GetId() != except) { - if (!aura->GetSpellInfo()->HasAttribute(SPELL_ATTR0_NO_IMMUNITIES)) - if (aura->GetSpellInfo()->GetAllEffectsMechanicMask() & mechanic_mask) - { - RemoveAura(iter, removemode); - continue; - } + if (aura->GetSpellInfo()->GetAllEffectsMechanicMask() & mechanic_mask) + { + RemoveAura(iter, removemode); + continue; + } } ++iter; }