diff options
| author | PKX <pkx.icehell@gmail.com> | 2011-11-16 11:16:23 +0100 |
|---|---|---|
| committer | PKX <pkx.icehell@gmail.com> | 2012-01-27 15:43:21 +0100 |
| commit | 727133b0497b1c45dcfeb34bb915865512bb1747 (patch) | |
| tree | edf6d6a28a03e22ce8a61ed444a466dbd2d4facb | |
| parent | 6c1815db7f795e697f2df18a554f5b1a33e6c73a (diff) | |
Core/Auras: Fix Pet & Totem aura stacking
Fixes aura staking for Pet, Totem and other spell effects that do not use SPELL_EFFECT_APPLY_AURA
Signed-off-by: PKX <pkx.icehell@gmail.com>
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 6bab63acf1b..d8e2a56847a 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -3306,19 +3306,19 @@ void Unit::_RemoveNoStackAurasDueToAura(Aura* aura) return; bool remove = false; - for (AuraMap::iterator i = m_ownedAuras.begin(); i != m_ownedAuras.end(); ++i) + for (AuraApplicationMap::iterator i = m_appliedAuras.begin(); i != m_appliedAuras.end(); ++i) { if (remove) { remove = false; - i = m_ownedAuras.begin(); + i = m_appliedAuras.begin(); } - if (aura->CanStackWith(i->second)) + if (aura->CanStackWith(i->second->GetBase())) continue; - RemoveOwnedAura(i, AURA_REMOVE_BY_DEFAULT); - if (i == m_ownedAuras.end()) + RemoveAura(i, AURA_REMOVE_BY_DEFAULT); + if (i == m_appliedAuras.end()) break; remove = true; } |
