josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Fix freezing trap.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2009-06-07 12:49:06 +02:00
parent 37d94053df
commit 076379d3ef
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/SpellEffects.cpp
+13 -2
View File
@@ -2134,13 +2134,18 @@ void Spell::EffectTriggerSpell(uint32 i)
return; return;
} }
// Remove spell cooldown (not category) if spell triggering spell with cooldown and same category
// Needed by freezing trap and few other spells
if (m_caster->GetTypeId() == TYPEID_PLAYER && m_spellInfo->CategoryRecoveryTime && spellInfo->CategoryRecoveryTime
&& m_spellInfo->Category == spellInfo->Category)
((Player*)m_caster)->RemoveSpellCooldown(spellInfo->Id);
// some triggered spells must be casted instantly (for example, if next effect case instant kill caster) // some triggered spells must be casted instantly (for example, if next effect case instant kill caster)
bool instant = false; bool instant = false;
for(uint32 j = i+1; j < 3; ++j) for(uint32 j = i+1; j < 3; ++j)
{ {
if(m_spellInfo->EffectImplicitTargetA[j] == TARGET_UNIT_CASTER if(m_spellInfo->EffectImplicitTargetA[j] == TARGET_UNIT_CASTER
&& (m_spellInfo->Effect[j]==SPELL_EFFECT_INSTAKILL && (m_spellInfo->Effect[j]==SPELL_EFFECT_INSTAKILL))
|| m_spellInfo->Effect[j]==SPELL_EFFECT_SANCTUARY))
{ {
instant = true; instant = true;
break; break;
@@ -2173,6 +2178,12 @@ void Spell::EffectTriggerMissileSpell(uint32 effect_idx)
if (m_CastItem) if (m_CastItem)
DEBUG_LOG("WORLD: cast Item spellId - %i", spellInfo->Id); DEBUG_LOG("WORLD: cast Item spellId - %i", spellInfo->Id);
// Remove spell cooldown (not category) if spell triggering spell with cooldown and same category
// Needed by freezing trap and few other spells
if (m_caster->GetTypeId() == TYPEID_PLAYER && m_spellInfo->CategoryRecoveryTime && spellInfo->CategoryRecoveryTime
&& m_spellInfo->Category == spellInfo->Category)
((Player*)m_caster)->RemoveSpellCooldown(spellInfo->Id);
m_caster->CastSpell(m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, spellInfo->Id, true, m_CastItem, 0, m_originalCasterGUID); m_caster->CastSpell(m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, spellInfo->Id, true, m_CastItem, 0, m_originalCasterGUID);
} }