*Fix a infinite loop introduced in 3453. Thanks to QAston and Drahy.

--HG--
branch : trunk

1 files changed, 12 insertions, 5 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 6f6d323c2a8..435190b8d10 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -3897,16 +3897,20 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur)
     uint32 spellId = Aur->GetId();
 
     // passive spell special case (only non stackable with ranks)
-    if(IsPassiveSpell(spellId))
-    {
-        if(IsPassiveSpellStackableWithRanks(spellProto))
-            return true;
-    }
+    if(IsPassiveSpell(spellId) && IsPassiveSpellStackableWithRanks(spellProto))
+        return true;
 
     //bool linked = spellmgr.GetSpellCustomAttr(spellId) & SPELL_ATTR_CU_LINK_AURA? true : false;
 
+    bool remove = false;
     for(AuraMap::iterator i = m_Auras.begin(); i != m_Auras.end(); ++i)
     {
+        if(remove)
+        {
+            remove = false;
+            i = m_Auras.begin();
+        }
+
         SpellEntry const* i_spellProto = i->second->GetSpellProto();
         uint32 i_spellId = i_spellProto->Id;
         bool sameCaster = Aur->GetCasterGUID() == (*i).second->GetCasterGUID();
@@ -3963,6 +3967,9 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur)
 
         // Remove all auras by aura caster
         RemoveAura(i, AURA_REMOVE_BY_STACK);
+        if(i == m_Auras.end())
+            break;
+        remove = true;
     }
     return true;
 }