aboutsummaryrefslogtreecommitdiff
path: root/src/game/Spell.cpp
diff options
context:
space:
mode:
authorthenecromancer <none@none>2010-01-25 02:38:53 +0100
committerthenecromancer <none@none>2010-01-25 02:38:53 +0100
commit83c2b6a4d0e15999aa8bd6acbe36786a3d1b782b (patch)
tree6150525386b4801dc0ea1a73c36069e5e6fdf20f /src/game/Spell.cpp
parent9880a4985b6345ebad297dd9040fae1096d9abff (diff)
parent5be6e1e3c4970e5b453cca4c0c8d1fb7863ffb48 (diff)
Merge
--HG-- branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
-rw-r--r--src/game/Spell.cpp5
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