aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/TC1_1477_world_spell.sql3
-rw-r--r--sql/world_spell_full.sql7
-rw-r--r--src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp3
3 files changed, 12 insertions, 1 deletions
diff --git a/sql/updates/TC1_1477_world_spell.sql b/sql/updates/TC1_1477_world_spell.sql
new file mode 100644
index 00000000000..a7f9bd30b59
--- /dev/null
+++ b/sql/updates/TC1_1477_world_spell.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_proc_event` WHERE `entry` = 42370;
+INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
+(42370, 0x00, 11, 0x00000080, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);
diff --git a/sql/world_spell_full.sql b/sql/world_spell_full.sql
index 7885866c854..a8ddbf59445 100644
--- a/sql/world_spell_full.sql
+++ b/sql/world_spell_full.sql
@@ -477,3 +477,10 @@ INSERT INTO spell_target_position () VALUES (46019, 580, 1704.34, 928.17, -74.55
INSERT INTO spell_target_position () VALUES (46020, 580, 1704.34, 928.17, 53.079, 0);
INSERT INTO spell_target_position () VALUES (53360, 571, 5807.829, 587.960, 660.939, 1.663);
+-- --------
+-- PROC
+-- --------
+DELETE FROM `spell_proc_event` WHERE `entry` IN (42370);
+INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
+(42370, 0x00, 11, 0x00000080, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); -- Merciless Totem of the Third Wind --
+
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp
index af44d96d417..dfeb7fea3e6 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp
+++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp
@@ -410,7 +410,8 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
else
{
Unit *target = NULL;
- if(Phase1 && target && (target = m_creature->SelectNearestTarget(5)))
+ target = m_creature->SelectNearestTarget(5);
+ if(Phase1 && target)
m_creature->AI()->AttackStart(target);
else
{