aboutsummaryrefslogtreecommitdiff
path: root/src/game/Spell.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2009-04-15 20:58:39 +0200
committerQAston <none@none>2009-04-15 20:58:39 +0200
commit8ca97f7bcbb7cc8d20eeefe2ee3c6646542ae6cb (patch)
treea7a3ea000ac523ef1111b5bc909ef141a7e7c958 /src/game/Spell.cpp
parentfcbdb1012212fee36f67dee764efb089f4e40584 (diff)
Backed out changeset 77ac33a3948b - it caused problems with some channeled spells (interruption)
--HG-- branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
-rw-r--r--src/game/Spell.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index f14cc6b5ed3..41d01772c50 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -1100,8 +1100,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
{
@@ -2209,9 +2209,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();