aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2016-09-04 04:56:05 -0300
committerariel- <ariel-@users.noreply.github.com>2016-09-04 04:56:05 -0300
commit7cc91dc45b618a6ee15caf7559242011abac8005 (patch)
tree8f0411105ac6fe400c7f235d5751ebdb1803561e /src
parent746b838870e93d9843a089613ce7f1cd160b6ea5 (diff)
Core/Scripts: add missing check removed in 746b838870e93d9843a089613ce7f1cd160b6ea5
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/Spells/spell_hunter.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp
index 7888588b416..6317dfc9a29 100644
--- a/src/server/scripts/Spells/spell_hunter.cpp
+++ b/src/server/scripts/Spells/spell_hunter.cpp
@@ -512,6 +512,12 @@ class spell_hun_lock_and_load : public SpellScriptLoader
if (!(eventInfo.GetTypeMask() & mask))
return;
+ // Additional check: do not proc on traps for immolation/explosive trap
+ // (But still do it for the periodic damage part)
+ if (mask == PROC_FLAG_DONE_TRAP_ACTIVATION)
+ if (!(eventInfo.GetDamageInfo()->GetSchoolMask() & SPELL_SCHOOL_MASK_FROST))
+ return;
+
if (!roll_chance_i(aurEff->GetAmount()))
return;