*Merge.

--HG--
branch : trunk

4 files changed, 15 insertions, 0 deletions

diff --git a/sql/updates/1018_world.sql b/sql/updates/1018_world.sql
new file mode 100644
index 00000000000..ca298faa8f3
--- /dev/null
+++ b/sql/updates/1018_world.sql
@@ -0,0 +1,6 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (31224,41292,44007,44867);
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
+(31224,  -1543,  2, 'Cloak of Shadows - Flare'),
+(41292,  42017,  2, 'Aura of Suffering'),
+(44007,  -43657, 2, 'Storm Eye Safe Zone Immune'),
+(44867,  -46019, 2, 'Spectral Exhaustion - Teleport: Spectral Realm');
\ No newline at end of file
diff --git a/sql/updates/1026_world.sql b/sql/updates/1026_world.sql
new file mode 100644
index 00000000000..90ff7d23120
--- /dev/null
+++ b/sql/updates/1026_world.sql
@@ -0,0 +1,5 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_effect` IN ('33686', '31705');
+INSERT INTO `spell_linked_spell`(`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+('-33711','33686','0','Murmur\'s Shockwave (Normal)'),
+('-38794','33686','0','Murmur\'s Shockwave (Heroic)'),
+('33686','31705','0','Murmur\'s Shockwave Jump');
\ No newline at end of file
diff --git a/sql/updates/1028_world_scripts.sql b/sql/updates/1028_world_scripts.sql
new file mode 100644
index 00000000000..2023243b456
--- /dev/null
+++ b/sql/updates/1028_world_scripts.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='boss_the_black_stalker' WHERE `entry`='17882';
\ No newline at end of file
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index f4a2cbe3113..3a90daa799c 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -24,4 +24,7 @@ INSTALL(FILES
 1207_world_scripts.sql
 1237_mangos_7230_01_world_spell_bonus_data
 1248_mangos_7235_01_world_command
+1018_world.sql
+1026_world.sql
+1028_world_scripts.sql
 DESTINATION share/trinity/sql/updates)
\ No newline at end of file