diff options
| author | QAston <none@none> | 2009-05-18 19:00:20 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-05-18 19:00:20 +0200 |
| commit | 6c7f2d2b242f950ab0e80a9da546806e672d37c1 (patch) | |
| tree | 905e7a9a829721f2c65cbf075c86f4f5b6d724d4 /src/game/Spell.cpp | |
| parent | e45c57f298acfb496947be150dd379e3f39bc673 (diff) | |
*Spell_proc_event entries for Malestorm Weapon - by throneinc
*Fix bug that some spells can't proc
*Add spell_proc_event entries for some items.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
| -rw-r--r-- | src/game/Spell.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 33a3e4e1599..5a68a5dee95 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -745,10 +745,12 @@ void Spell::prepareDataForTriggerSystem(AuraEffect * triggeredByAura) m_procEx = (m_IsTriggeredSpell) && !(m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_TRIGGERED_CAN_TRIGGER) - && !(m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_TRIGGERED_CAN_TRIGGER_2) + && !(m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_TRIGGERED_CAN_TRIGGER_2) ? PROC_EX_INTERNAL_TRIGGERED : PROC_EX_NONE; - if (m_IsTriggeredSpell && (m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_TRIGGERED_CAN_TRIGGER_2 | SPELL_ATTR_EX2_TRIGGERED_CAN_TRIGGER)) + 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; // Totem casts require spellfamilymask defined in spell_proc_event to proc |