*Merge.
--HG-- branch : trunk
This commit is contained in:
commit
107218fe44
12 files changed
+185
-99
No files matched your search
+6
-2
@@ -3744,7 +3744,8 @@ bool Unit::AddAura(Aura *Aur)
|
||||
m_interruptableAuras.push_back(Aur);
|
||||
AddInterruptMask(Aur->GetSpellProto()->AuraInterruptFlags);
|
||||
}
|
||||
if(Aur->GetSpellProto()->Attributes & SPELL_ATTR_BREAKABLE_BY_DAMAGE)
|
||||
if((Aur->GetSpellProto()->Attributes & SPELL_ATTR_BREAKABLE_BY_DAMAGE)
|
||||
&& (Aur->GetModifier()->m_auraname != SPELL_AURA_MOD_POSSESS)) //only dummy aura is breakable
|
||||
{
|
||||
m_ccAuras.push_back(Aur);
|
||||
}
|
||||
@@ -4109,8 +4110,11 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode)
|
||||
UpdateInterruptMask();
|
||||
}
|
||||
|
||||
if(Aur->GetSpellProto()->Attributes & SPELL_ATTR_BREAKABLE_BY_DAMAGE)
|
||||
if((Aur->GetSpellProto()->Attributes & SPELL_ATTR_BREAKABLE_BY_DAMAGE)
|
||||
&& (Aur->GetModifier()->m_auraname != SPELL_AURA_MOD_POSSESS)) //only dummy aura is breakable
|
||||
{
|
||||
m_ccAuras.remove(Aur);
|
||||
}
|
||||
}
|
||||
|
||||
// Set remove mode
|
||||
|
||||
Reference in new issue
Block a user