aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2017-01-21 23:48:04 -0300
committerariel- <ariel-@users.noreply.github.com>2017-01-21 23:48:04 -0300
commita8c2d5986411b5027a8716bc7f96e57c2ec4f70a (patch)
tree741cf6e27964bcd34b1af230c72a28cb31691c96
parentc3474f57bc053c67448169a4c7bb83e10bb25015 (diff)
Core/Scripts: Fix Lock and Load proc with Frost trap
-rw-r--r--sql/updates/world/3.3.5/2017_01_22_01_world_335.sql1
-rw-r--r--src/server/scripts/Spells/spell_hunter.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/sql/updates/world/3.3.5/2017_01_22_01_world_335.sql b/sql/updates/world/3.3.5/2017_01_22_01_world_335.sql
new file mode 100644
index 00000000000..850842436c3
--- /dev/null
+++ b/sql/updates/world/3.3.5/2017_01_22_01_world_335.sql
@@ -0,0 +1 @@
+UPDATE `spell_proc` SET `SpellPhaseMask`=0x4 WHERE `SpellId`=-56342;
diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp
index a5f5b1de1d7..55178271540 100644
--- a/src/server/scripts/Spells/spell_hunter.cpp
+++ b/src/server/scripts/Spells/spell_hunter.cpp
@@ -687,8 +687,8 @@ class spell_hun_lock_and_load : public SpellScriptLoader
return false;
// Do not proc on traps for immolation/explosive trap
- DamageInfo* damageInfo = eventInfo.GetDamageInfo();
- if (!damageInfo || !(damageInfo->GetSchoolMask() & SPELL_SCHOOL_MASK_FROST))
+ SpellInfo const* spellInfo = eventInfo.GetSpellInfo();
+ if (!spellInfo || !(spellInfo->GetSchoolMask() & SPELL_SCHOOL_MASK_FROST))
return false;
return roll_chance_i(aurEff->GetAmount());