*Merge

--HG--
branch : trunk

3 files changed, 12 insertions, 1 deletions

diff --git a/sql/updates/1886_world.sql b/sql/updates/1886_world.sql
new file mode 100644
index 00000000000..d682101ff6f
--- /dev/null
+++ b/sql/updates/1886_world.sql
@@ -0,0 +1,6 @@
+INSERT INTO `spell_linked_spell` VALUES (61847, 61848, 2, 'Aspect of te dragonhawk');
+INSERT INTO `spell_linked_spell` VALUES (61846, 61848, 2, 'Aspect of te dragonhawk');
+
+-- Glyph of Aspect of the Monkey
+REPLACE INTO `spell_proc_event` VALUES (13163, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000010, 0.000000, 0.000000, 0);
+REPLACE INTO `spell_proc_event` VALUES (61848, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000010, 0.000000, 0.000000, 0);
diff --git a/sql/updates/1895_world.sql b/sql/updates/1895_world.sql
new file mode 100644
index 00000000000..a6387631352
--- /dev/null
+++ b/sql/updates/1895_world.sql
@@ -0,0 +1,4 @@
+DELETE FROM spell_proc_event where entry IN (31124, 31126);
+INSERT INTO spell_proc_event () VALUES
+(31124, 0, 8, 16777222, 0, 0, 0, 0, 0),
+(31126, 0, 8, 16777222, 0, 0, 0, 0, 0);
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index dc5d2c1f557..71774b4ebbc 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -79,6 +79,7 @@ INSTALL(FILES
 1825_world.sql
 1828_world.sql
 1857_world.sql
-1881_world.sql
 1884_world.sql
+1886_world.sql
+1895_world.sql
 DESTINATION share/trinity/sql/updates)
\ No newline at end of file