diff options
| author | Xanadu <none@none> | 2010-01-25 02:09:29 +0100 |
|---|---|---|
| committer | Xanadu <none@none> | 2010-01-25 02:09:29 +0100 |
| commit | 5be6e1e3c4970e5b453cca4c0c8d1fb7863ffb48 (patch) | |
| tree | 4adbc80ebc8e6dfae74bc688510d592666dc00db /src | |
| parent | 7aa63d583437c9171fda4fcb9ab51d24084c6e32 (diff) | |
| parent | 6fb6aa9c6612aa036001ec7f7dd9f2c256f8bfbc (diff) | |
Merge after backout
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Spell.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index f60c880331c..1cc530f5ada 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -814,8 +814,9 @@ void Spell::prepareDataForTriggerSystem(AuraEffect const * triggeredByAura) } m_procEx= PROC_EX_NONE; - // Hunter traps Entrapment trigger: Frost Trap and Snake Trap initial activation - if (m_spellInfo->Id == 13810 || m_spellInfo->Id == 57879) + // Hunter traps spells (for Entrapment trigger) + // Gives your Immolation Trap, Frost Trap, Explosive Trap, and Snake Trap .... + if (m_spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER && (m_spellInfo->SpellFamilyFlags[1] & 0x00002000 || m_spellInfo->SpellFamilyFlags[0] & 0x1C)) { m_procAttacker |= PROC_FLAG_ON_TRAP_ACTIVATION; // Trigger only from spells originally casted by hunter(trap activation) to prevent multiple trigger from trap triggered spells |