*Do not let spell (stun/confuse/fear) interrupt itself (cause crash).

--HG--
branch : trunk

1 files changed, 4 insertions, 0 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index f7e02f1469c..c8cf1239587 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -3777,6 +3777,10 @@ void Unit::InterruptSpell(uint32 spellType, bool withDelayed)
 
     if(m_currentSpells[spellType] && (withDelayed || m_currentSpells[spellType]->getState() != SPELL_STATE_DELAYED) )
     {
+        // for example, do not let self-stun aura interrupt itself
+        if(!m_currentSpells[spellType]->IsInterruptable())
+            return;
+
         // send autorepeat cancel message for autorepeat spells
         if (spellType == CURRENT_AUTOREPEAT_SPELL)
         {