Core/Spells: fix Global Cooldown reset on spell cast interrupt.

2011-04-11 16:35:31 +06:00
parent 5357b1ba77
commit e38634186c
2 changed files with 7 additions and 9 deletions
@@ -2981,17 +2981,15 @@ void Unit::InterruptSpell(CurrentSpellTypes spellType, bool withDelayed, bool wi
        if (!spell->IsInterruptable())
            return;

-        m_currentSpells[spellType] = NULL;
-
        // send autorepeat cancel message for autorepeat spells
        if (spellType == CURRENT_AUTOREPEAT_SPELL)
-        {
            if (GetTypeId() == TYPEID_PLAYER)
-                this->ToPlayer()->SendAutoRepeatCancel(this);
-        }
+                ToPlayer()->SendAutoRepeatCancel(this);

        if (spell->getState() != SPELL_STATE_FINISHED)
            spell->cancel();
+
+        m_currentSpells[spellType] = NULL;
        spell->SetReferencedFromCurrent(false);
    }
 }