diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/SpellMgr.cpp | 7 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 7f9e05e1591..328da769b86 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1176,13 +1176,6 @@ void SpellMgr::LoadSpellBonusess() bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellProcEvent, uint32 EventProcFlag, SpellEntry const * procSpell, uint32 procFlags, uint32 procExtra, bool active) { - // Additional checks for triggered spells - if (procExtra & PROC_EX_INTERNAL_TRIGGERED) - { - if (!(procSpell->AttributesEx3 & SPELL_ATTR_EX3_CAN_PROC_TRIGGERED)) - return false; - } - // No extra req need uint32 procEvent_procEx = PROC_EX_NONE; diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 850ee996d14..eedfe3d1973 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -12350,6 +12350,13 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura * aura, SpellEntry co if (!EventProcFlag) return false; + // Additional checks for triggered spells + if (procExtra & PROC_EX_INTERNAL_TRIGGERED) + { + if (!(spellProto->AttributesEx3 & SPELL_ATTR_EX3_CAN_PROC_TRIGGERED)) + return false; + } + // Check spellProcEvent data requirements if(!spellmgr.IsSpellProcEventCanTriggeredBy(spellProcEvent, EventProcFlag, procSpell, procFlag, procExtra, active)) return false; |