*Fix auras stacking.
--HG-- branch : trunk
This commit is contained in:
1 parent
0f61bac93d
commit
5e6435c3b2
2 files changed
+29
-43
No files matched your search
+4
-7
@@ -3729,13 +3729,10 @@ bool Unit::AddAura(Aura *Aur)
|
||||
}
|
||||
|
||||
// passive auras not stacable with other ranks
|
||||
if (!IsPassiveSpellStackableWithRanks(aurSpellInfo))
|
||||
if (!RemoveNoStackAurasDueToAura(Aur))
|
||||
{
|
||||
if (!RemoveNoStackAurasDueToAura(Aur))
|
||||
{
|
||||
delete Aur;
|
||||
return false; // couldn't remove conflicting aura with higher rank
|
||||
}
|
||||
delete Aur;
|
||||
return false; // couldn't remove conflicting aura with higher rank
|
||||
}
|
||||
|
||||
// update single target auras list (before aura add to aura list, to prevent unexpected remove recently added aura)
|
||||
@@ -3890,7 +3887,7 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur)
|
||||
// Remove all auras by aura caster
|
||||
RemoveAurasDueToSpell(i_spellId , (*i).second->GetCasterGUID(), AURA_REMOVE_BY_STACK);
|
||||
|
||||
if( m_Auras.empty() )
|
||||
if( m_Auras.empty())
|
||||
break;
|
||||
else
|
||||
next = m_Auras.begin();
|
||||
|
||||
Reference in new issue
Block a user