mirror of
https://github.com/liyunfan1223/azerothcore-wotlk.git
synced 2026-08-04 22:07:52 +00:00
Revert "fix(Core/Spells): SPELL_ATTR1_IMMUNITY_PURGES_EFFECT should not remov…" (#20245)
This reverts commit 572be7d69f.
This commit is contained in:
@@ -5122,9 +5122,6 @@ void Unit::RemoveAurasByType(AuraType auraType, ObjectGuid casterGUID, Aura* exc
|
|||||||
if (aura != except && (!casterGUID || aura->GetCasterGUID() == casterGUID)
|
if (aura != except && (!casterGUID || aura->GetCasterGUID() == casterGUID)
|
||||||
&& ((negative && !aurApp->IsPositive()) || (positive && aurApp->IsPositive())))
|
&& ((negative && !aurApp->IsPositive()) || (positive && aurApp->IsPositive())))
|
||||||
{
|
{
|
||||||
if (aura->GetSpellInfo()->HasAttribute(SPELL_ATTR0_NO_IMMUNITIES))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
uint32 removedAuras = m_removedAurasCount;
|
uint32 removedAuras = m_removedAurasCount;
|
||||||
RemoveAura(aurApp);
|
RemoveAura(aurApp);
|
||||||
if (m_removedAurasCount > removedAuras + 1)
|
if (m_removedAurasCount > removedAuras + 1)
|
||||||
@@ -5260,12 +5257,11 @@ void Unit::RemoveAurasWithMechanic(uint32 mechanic_mask, AuraRemoveMode removemo
|
|||||||
Aura const* aura = iter->second->GetBase();
|
Aura const* aura = iter->second->GetBase();
|
||||||
if (!except || aura->GetId() != except)
|
if (!except || aura->GetId() != except)
|
||||||
{
|
{
|
||||||
if (!aura->GetSpellInfo()->HasAttribute(SPELL_ATTR0_NO_IMMUNITIES))
|
if (aura->GetSpellInfo()->GetAllEffectsMechanicMask() & mechanic_mask)
|
||||||
if (aura->GetSpellInfo()->GetAllEffectsMechanicMask() & mechanic_mask)
|
{
|
||||||
{
|
RemoveAura(iter, removemode);
|
||||||
RemoveAura(iter, removemode);
|
continue;
|
||||||
continue;
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
++iter;
|
++iter;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user