public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 07:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix(Core/Unit): NPC enters into EvadeMode, he loses all his Auras (#6379)" (#7793)

Browse Source 
This reverts commit 569e3399c6.
This commit is contained in:
Francesco Borzì
2021-09-09 10:51:19 +02:00
committed by GitHub
parent 551747d4c0
commit efdb64af07
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -4791,7 +4791,7 @@ void Unit::RemoveEvadeAuras()
for (AuraApplicationMap::iterator iter = m_appliedAuras.begin(); iter != m_appliedAuras.end();) for (AuraApplicationMap::iterator iter = m_appliedAuras.begin(); iter != m_appliedAuras.end();)
{ {
Aura const* aura = iter->second->GetBase(); Aura const* aura = iter->second->GetBase();
if (aura->GetSpellInfo()->HasAura(SPELL_AURA_CONTROL_VEHICLE) || aura->GetSpellInfo()->HasAura(SPELL_AURA_CLONE_CASTER) || aura->GetSpellInfo()->IsSelfCast() || (aura->IsPassive() && GetOwnerGUID().IsPlayer())) if (aura->GetSpellInfo()->HasAura(SPELL_AURA_CONTROL_VEHICLE) || aura->GetSpellInfo()->HasAura(SPELL_AURA_CLONE_CASTER) || (aura->IsPassive() && GetOwnerGUID().IsPlayer()))
++iter; ++iter;
else else
_UnapplyAura(iter, AURA_REMOVE_BY_DEFAULT); _UnapplyAura(iter, AURA_REMOVE_BY_DEFAULT);
@@ -4800,7 +4800,7 @@ void Unit::RemoveEvadeAuras()
for (AuraMap::iterator iter = m_ownedAuras.begin(); iter != m_ownedAuras.end();) for (AuraMap::iterator iter = m_ownedAuras.begin(); iter != m_ownedAuras.end();)
{ {
Aura* aura = iter->second; Aura* aura = iter->second;
if (aura->GetSpellInfo()->HasAura(SPELL_AURA_CONTROL_VEHICLE) || aura->GetSpellInfo()->HasAura(SPELL_AURA_CLONE_CASTER) || aura->GetSpellInfo()->IsSelfCast() || (aura->IsPassive() && GetOwnerGUID().IsPlayer())) if (aura->GetSpellInfo()->HasAura(SPELL_AURA_CONTROL_VEHICLE) || aura->GetSpellInfo()->HasAura(SPELL_AURA_CLONE_CASTER) || (aura->IsPassive() && GetOwnerGUID().IsPlayer()))
++iter; ++iter;
else else
RemoveOwnedAura(iter, AURA_REMOVE_BY_DEFAULT); RemoveOwnedAura(iter, AURA_REMOVE_BY_DEFAULT);