aboutsummaryrefslogtreecommitdiff
path: root/src/game/Spell.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2009-04-12 16:18:55 +0200
committerQAston <none@none>2009-04-12 16:18:55 +0200
commitfcbdb1012212fee36f67dee764efb089f4e40584 (patch)
tree005ec06d9c671495b0902ecf52f4e90a5ffa64ef /src/game/Spell.cpp
parent7409df2dc90c6f831cdf199ae02ba05f3b5a9ed7 (diff)
*Fix cooldown set for Reincarnation
*Change some aura interrupt flags description to handle stealth breaking correctly. --HG-- branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
-rw-r--r--src/game/Spell.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 41d01772c50..f14cc6b5ed3 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,6 +2209,9 @@ 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();