aboutsummaryrefslogtreecommitdiff
path: root/src/game/Spell.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-05-06 09:36:51 -0500
committermegamage <none@none>2009-05-06 09:36:51 -0500
commit22667d3ee6ee258e60a711e2d1a504a9769d071c (patch)
tree8d67e06df3beeacec2d19eb9d03ff8e7e353f41e /src/game/Spell.cpp
parent50dc00cce0f6efc4424be7648d33c38cc189c54c (diff)
*Update script of heigan.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
-rw-r--r--src/game/Spell.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index c863e8cc933..912bea7e89b 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -2297,7 +2297,8 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect* triggeredByAura
ReSetTimer();
//Containers for channeled spells have to be set
//TODO:Apply this to all casted spells if needed
- if(m_IsTriggeredSpell && !IsChanneledSpell(m_spellInfo))
+ // Why check m_casttime? 29350: channelled triggers channelled
+ if(m_IsTriggeredSpell && (!IsChanneledSpell(m_spellInfo) || !m_casttime))
cast(true);
else
{