*Merge

--HG--
branch : trunk

1 files changed, 2 insertions, 5 deletions

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 073425741d7..d9aa5ffc2a1 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -1108,8 +1108,8 @@ void Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask)
             }
 
             unit->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_HITBYSPELL);
-            //if(m_customAttr & SPELL_ATTR_CU_AURA_CC)
-                //unit->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_CC);
+            if(m_customAttr & SPELL_ATTR_CU_AURA_CC)
+                unit->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_CC);
         }
         else
         {
@@ -2220,9 +2220,6 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect* triggeredByAura
         if(isSpellBreakStealth(m_spellInfo) )
             m_caster->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_CAST);
 
-        if(!m_IsTriggeredSpell)
-            m_caster->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ANY_CAST);
-
         m_caster->SetCurrentCastedSpell( this );
         m_selfContainer = &(m_caster->m_currentSpells[GetCurrentContainer()]);
         SendSpellStart();