diff options
| author | QAston <none@none> | 2009-04-23 14:20:14 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-04-23 14:20:14 +0200 |
| commit | cedc328d1fde51433fe2834a1ed6fb1603635a11 (patch) | |
| tree | 8a9c87edb6a542064b16f56405ccfc553f108794 /src/game/Spell.cpp | |
| parent | bce871f253d65da99f298c7eaf798b61c8c31369 (diff) | |
Allow Penance to trigger Grace.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
| -rw-r--r-- | src/game/Spell.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 620131e61f6..e28eaa7b46c 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -915,7 +915,10 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target) // Fill base trigger info uint32 procAttacker = m_procAttacker; uint32 procVictim = m_procVictim; - uint32 procEx = m_triggeredByAuraSpell && !(m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_TRIGGERED_CAN_TRIGGER) ? PROC_EX_INTERNAL_TRIGGERED : PROC_EX_NONE; + uint32 procEx = m_triggeredByAuraSpell + && !(m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_TRIGGERED_CAN_TRIGGER) + && !(m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_TRIGGERED_CAN_TRIGGER_2) + ? PROC_EX_INTERNAL_TRIGGERED : PROC_EX_NONE; m_spellAura = NULL; // Set aura to null for every target-make sure that pointer is not used for unit without aura applied if (missInfo==SPELL_MISS_NONE) // In case spell hit target, do all effect on that target |