*Set interrupt aura with remove cancel.

--HG--
branch : trunk

1 files changed, 13 insertions, 1 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index f0472292027..e7b31aa5546 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -572,7 +572,7 @@ void Unit::RemoveAurasWithInterruptFlags(uint32 flag, uint32 except)
                 sLog.outError("Aura %u is trying to remove itself! Flag %u. May cause crash!", (*iter)->GetId(), flag);
             else if(!except || (*iter)->GetId() != except)
             {
-                RemoveAurasDueToSpell((*iter)->GetId());
+                RemoveAurasBySpell((*iter)->GetId(), AURA_REMOVE_BY_CANCEL);
                 if (!m_interruptableAuras.empty())
                     next = m_interruptableAuras.begin();
                 else
@@ -4121,6 +4121,18 @@ void Unit::RemoveAura(uint32 spellId, uint32 effindex, Aura* except)
     }
 }
 
+void Unit::RemoveAurasBySpell(uint32 spellId, AuraRemoveMode removeMode)
+{
+    for (AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end(); )
+    {
+        Aura *aur = iter->second;
+        if (aur->GetId() == spellId)
+            RemoveAura(iter, removeMode);
+        else
+            ++iter;
+    }
+}
+
 void Unit::RemoveAurasByCasterSpell(uint32 spellId, uint64 casterGUID, AuraRemoveMode removeMode)
 {
     for (AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end(); )