aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBlaymoira <none@none>2009-03-15 11:37:03 +0100
committerBlaymoira <none@none>2009-03-15 11:37:03 +0100
commita1d942b39f9fae5d9609a8e0f33cd96334d8b94b (patch)
treecdfc79350c99c54374bac11506f4f630c1916647 /src
parent8c1914a3aec8f8f02cdbc3646bf7e383eb775a3a (diff)
*Don't apply school silence for delayed/instant spells. - by _krz
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/SpellEffects.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index d7e236b4be6..c974d835618 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -4367,7 +4367,7 @@ void Spell::EffectInterruptCast(uint32 i)
if (unitTarget->m_currentSpells[i])
{
// check if we can interrupt spell
- if ( unitTarget->m_currentSpells[i]->m_spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_INTERRUPT && unitTarget->m_currentSpells[i]->m_spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE )
+ if ( (unitTarget->m_currentSpells[i]->getState() == SPELL_STATE_CASTING || (unitTarget->m_currentSpells[i]->getState() == SPELL_STATE_PREPARING && unitTarget->m_currentSpells[i]->GetCastTime() > 0.0f)) && unitTarget->m_currentSpells[i]->m_spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_INTERRUPT && unitTarget->m_currentSpells[i]->m_spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE )
{
if(m_originalCaster)
{