diff options
| author | QAston <none@none> | 2009-06-30 15:45:47 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-06-30 15:45:47 +0200 |
| commit | 55a4458009532dbe8b9fa9ccf0695608b45626cb (patch) | |
| tree | 8be33e5fd27e80b7c0e2a6bcf4411146c756b90c /src/game/Spell.cpp | |
| parent | 6faa99e0093ffae00a2f452e3266b4933b5c3c23 (diff) | |
*Fix a typo causing problems with triggered spell procing.
*More correct damage calculation for conflagrate - by tlexii
--HG--
branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
| -rw-r--r-- | src/game/Spell.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 2f0225e67ab..656eb106152 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -825,7 +825,7 @@ void Spell::prepareDataForTriggerSystem(AuraEffect * triggeredByAura) Effects which are result of aura proc from triggered spell cannot proc to prevent chain proc of these spells */ - if ((triggeredByAura && !triggeredByAura->GetParentAura()->GetTarget()->CanProc()) || !m_caster->CanProc()) + if ((triggeredByAura && !triggeredByAura->GetParentAura()->GetTarget()->CanProc())) { m_canTrigger=false; } @@ -833,6 +833,8 @@ void Spell::prepareDataForTriggerSystem(AuraEffect * triggeredByAura) if (m_IsTriggeredSpell && (m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_TRIGGERED_CAN_TRIGGER || m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_TRIGGERED_CAN_TRIGGER_2)) + m_procEx |= PROC_EX_INTERNAL_CANT_PROC; + else if (m_IsTriggeredSpell) m_procEx |= PROC_EX_INTERNAL_TRIGGERED; // Totem casts require spellfamilymask defined in spell_proc_event to proc @@ -850,8 +852,6 @@ void Spell::prepareDataForTriggerSystem(AuraEffect * triggeredByAura) m_canTrigger=false; } } - if (m_IsTriggeredSpell || triggeredByAura) - m_procEx |= PROC_EX_INTERNAL_CANT_PROC; } void Spell::CleanupTargetList() @@ -1401,7 +1401,7 @@ void Spell::DoTriggersOnSpellHit(Unit *unit) if(roll_chance_i(i->second)) { m_caster->CastSpell(unit, i->first, true); - sLog.outDebug("Spell %d triggered spell %d by SPELL_AURA_ADD_TARGET_TRIGGER aura", m_spellInfo->Id, i->first); + sLog.outDebug("Spell %d triggered spell %d by SPELL_AURA_ADD_TARGET_TRIGGER aura", m_spellInfo->Id, i->first->Id); } if (GetSpellDuration(i->first)==-1) { |