aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/base/auth_database.sql3
-rw-r--r--sql/updates/auth/master/2020_05_19_00_auth.sql7
-rw-r--r--sql/updates/world/master/2020_06_14_00_world_2017_05_05_00_world.sql7
-rw-r--r--sql/updates/world/master/2020_06_14_01_world_2017_05_06_00_world.sql1
-rw-r--r--sql/updates/world/master/2020_06_14_02_world_2017_05_07_01_world.sql4
-rw-r--r--sql/updates/world/master/2020_06_14_03_world_2017_05_09_00_world.sql5
-rw-r--r--sql/updates/world/master/2020_06_14_04_world_2017_05_10_00_world.sql18
-rw-r--r--sql/updates/world/master/2020_06_14_05_world_2017_05_10_02_world.sql4
-rw-r--r--sql/updates/world/master/2020_06_14_06_world_2017_05_13_01_world.sql77
-rw-r--r--sql/updates/world/master/2020_06_14_07_world_2017_05_14_00_world_335.sql4
-rw-r--r--sql/updates/world/master/2020_06_14_08_world_2017_05_14_01_world.sql1
-rw-r--r--sql/updates/world/master/2020_06_14_09_world_2017_05_16_01_world.sql210
-rw-r--r--sql/updates/world/master/2020_06_14_10_world_2017_05_24_00_world.sql2
-rw-r--r--sql/updates/world/master/2020_06_14_11_world_2017_05_17_00_world.sql2
-rw-r--r--sql/updates/world/master/2020_06_14_12_world_2017_05_22_00_world.sql25
-rw-r--r--sql/updates/world/master/2020_06_14_13_world_2017_05_23_00_world.sql2
-rw-r--r--sql/updates/world/master/2020_06_14_14_world_2017_05_25_00_world.sql7
-rw-r--r--sql/updates/world/master/2020_06_14_15_world_2017_05_24_01_world.sql9
-rw-r--r--sql/updates/world/master/2020_06_14_16_world_2017_05_25_01_world.sql1
-rw-r--r--sql/updates/world/master/2020_06_14_17_world_2017_05_28_05_world.sql37
-rw-r--r--sql/updates/world/master/2020_06_14_18_world_2017_05_29_00_world.sql3
-rw-r--r--sql/updates/world/master/2020_06_14_19_world_2017_05_28_00_world.sql2
-rw-r--r--sql/updates/world/master/2020_06_14_20_world_2017_05_28_01_world.sql4
-rw-r--r--sql/updates/world/master/2020_06_14_21_world_2017_05_28_03_world.sql2
-rw-r--r--sql/updates/world/master/2020_06_14_22_world_2017_06_02_00_world.sql2
-rw-r--r--sql/updates/world/master/2020_06_14_23_world_2017_06_02_01_world.sql3
-rw-r--r--sql/updates/world/master/2020_06_14_24_world_2017_06_02_02_world.sql7
-rw-r--r--sql/updates/world/master/2020_06_14_25_world_2017_06_03_00_world.sql2
28 files changed, 451 insertions, 0 deletions
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 5ebb0a579eb..da0258f519b 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -1267,6 +1267,7 @@ INSERT INTO `rbac_linked_permissions` VALUES
(198,316),
(198,317),
(198,318),
+(198,855),
(198,367),
(198,368),
(198,369),
@@ -2084,6 +2085,7 @@ INSERT INTO `rbac_permissions` VALUES
(852,'Command: go offset'),
(853,'Command: .reload conversation_template'),
(854,'Command: .debug conversation'),
+(855,'Command: debug play music'),
(868,'Command: modify power'),
(869,'Command: debug send playerchoice'),
(872,'Command: server debug');
@@ -2331,6 +2333,7 @@ INSERT INTO `updates` VALUES
('2020_03_31_00_auth.sql','BA82A58E95730A397922B6723DA027986E6CD535','RELEASED','2020-03-31 17:00:16',0),
('2020_04_04_00_auth.sql','5F118989A9F8AFA3B2065AB9C2C0BB7D9A0EB97A','RELEASED','2020-04-04 13:23:53',0),
('2020_04_30_00_auth.sql','2FD304B8EF82D529D69287BF22EF061A267F827E','RELEASED','2020-04-30 00:39:29',0),
+('2020_05_19_00_auth.sql','12D9F26538F63546B74793499E8A71BD885E8E5F','RELEASED','2020-05-19 12:00:00',0),
('2020_06_04_00_auth.sql','BA797B558196B1A07F8FF66E5288AD04659CF6AC','RELEASED','2020-06-04 09:57:07',0);
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/sql/updates/auth/master/2020_05_19_00_auth.sql b/sql/updates/auth/master/2020_05_19_00_auth.sql
new file mode 100644
index 00000000000..7ddeabe630c
--- /dev/null
+++ b/sql/updates/auth/master/2020_05_19_00_auth.sql
@@ -0,0 +1,7 @@
+DELETE FROM `rbac_permissions` WHERE `id` = 855;
+INSERT INTO `rbac_permissions` (`id`,`name`) VALUES
+(855, 'Command: debug play music');
+
+DELETE FROM `rbac_linked_permissions` WHERE `id` = 855;
+INSERT INTO `rbac_linked_permissions` (`id`,`linkedId`) VALUES
+(198, 855);
diff --git a/sql/updates/world/master/2020_06_14_00_world_2017_05_05_00_world.sql b/sql/updates/world/master/2020_06_14_00_world_2017_05_05_00_world.sql
new file mode 100644
index 00000000000..47f6822d310
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_00_world_2017_05_05_00_world.sql
@@ -0,0 +1,7 @@
+UPDATE command SET name = 'reload achievement_reward_locale', help = 'Syntax: .reload achievement_reward_locale\nReload achievement_reward_locale table.' WHERE permission = 657;
+UPDATE command SET name = 'reload creature_template_locale', help = 'Syntax: .reload creature_template_locale\nReload creature_template_locale table.' WHERE permission = 658;
+UPDATE command SET name = 'reload creature_text_locale', help = 'Syntax: .reload creature_text_locale\nReload creature_text_locale Table.' WHERE permission = 659;
+UPDATE command SET name = 'reload gameobject_template_locale', help = 'Syntax: .reload gameobject_template_locale\nReload gameobject_template_locale table.' WHERE permission = 660;
+UPDATE command SET name = 'reload gossip_menu_option_locale', help = 'Syntax: .reload gossip_menu_option_locale\nReload gossip_menu_option_locale table.' WHERE permission = 661;
+UPDATE command SET name = 'reload page_tex_locale', help = 'Syntax: .reload page_tex_locale\nReload page_tex_locale table.' WHERE permission = 665;
+UPDATE command SET name = 'reload points_of_interest_locale', help = 'Syntax: .reload points_of_interest_locale\nReload points_of_interest_locale table.' WHERE permission = 666;
diff --git a/sql/updates/world/master/2020_06_14_01_world_2017_05_06_00_world.sql b/sql/updates/world/master/2020_06_14_01_world_2017_05_06_00_world.sql
new file mode 100644
index 00000000000..fa58a86f325
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_01_world_2017_05_06_00_world.sql
@@ -0,0 +1 @@
+UPDATE command SET name = 'reload page_text_locale', help = 'Syntax: .reload page_text_locale\nReload page_text_locale table.' WHERE permission = 665;
diff --git a/sql/updates/world/master/2020_06_14_02_world_2017_05_07_01_world.sql b/sql/updates/world/master/2020_06_14_02_world_2017_05_07_01_world.sql
new file mode 100644
index 00000000000..f33d464ab21
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_02_world_2017_05_07_01_world.sql
@@ -0,0 +1,4 @@
+--
+ALTER TABLE `gossip_menu_option_locale`
+DROP PRIMARY KEY,
+ADD PRIMARY KEY (`MenuID`, `OptionIndex`, `Locale`);
diff --git a/sql/updates/world/master/2020_06_14_03_world_2017_05_09_00_world.sql b/sql/updates/world/master/2020_06_14_03_world_2017_05_09_00_world.sql
new file mode 100644
index 00000000000..6134763d355
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_03_world_2017_05_09_00_world.sql
@@ -0,0 +1,5 @@
+--
+UPDATE `creature_template` SET `unit_flags`=768, `RegenHealth`=0 WHERE `entry`=26335;
+DELETE FROM `creature_template_addon` WHERE `entry`=26335;
+INSERT INTO `creature_template_addon` (`entry`, `bytes1`, `bytes2`) VALUES (26335, 7, 1);
+UPDATE `creature` SET `curhealth`=1 WHERE `id`=26335;
diff --git a/sql/updates/world/master/2020_06_14_04_world_2017_05_10_00_world.sql b/sql/updates/world/master/2020_06_14_04_world_2017_05_10_00_world.sql
new file mode 100644
index 00000000000..57f1bec7778
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_04_world_2017_05_10_00_world.sql
@@ -0,0 +1,18 @@
+-- Arcatraz Sentinel (20869, 21586)
+DELETE FROM `creature_template_addon` WHERE entry IN (20869, 21586);
+INSERT INTO `creature_template_addon` (entry, path_id, mount, bytes1, bytes2, emote, auras) VALUES
+(20869, 0, 0, 0, 1, 0, "31261 36716"),
+(21586, 0, 0, 0, 1, 0, "31261 38828");
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=20869;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=20869 AND `source_type`=0;
+INSERT INTO `smart_scripts` VALUES
+(20869, 0, 0, 0, 2, 0, 100, 1, 0, 10, 0, 0, 0, '', 11, 36719, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Arcatraz Sentinel - Between 0-2% Health - Cast Spell Explode'),
+(20869, 0, 1, 0, 6, 0, 100, 1, 0, 0, 0, 0, 0, '', 11, 37394, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Arcatraz Sentinel - Death - Cast Serverside - Summon Destroyed Sentinel'),
+(20869, 0, 2, 3, 10, 0, 100, 1, 0, 15, 0, 0, 1, '', 28, 31261, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Arcatraz Sentinel - ooc los - remove aura'),
+(20869, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, '', 49, 0, 0, 0, 0, 0, 0, 21, 50, 0, 0, 0, 0, 0, 0, 'Arcatraz Sentinel - ooc los - Start attack');
+
+-- DELETE FROM `spelldifficulty_dbc` WHERE id IN (36719,36716);
+-- INSERT INTO `spelldifficulty_dbc` (`id`,`spellid0`, `spellid1`) VALUES
+-- (36719,36719,38830),
+-- (36716,36716,38828);
diff --git a/sql/updates/world/master/2020_06_14_05_world_2017_05_10_02_world.sql b/sql/updates/world/master/2020_06_14_05_world_2017_05_10_02_world.sql
new file mode 100644
index 00000000000..fd462c4543d
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_05_world_2017_05_10_02_world.sql
@@ -0,0 +1,4 @@
+--
+DELETE FROM `gameobject` WHERE `guid`=59;
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnDifficulties`,`PhaseID`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
+(59, 194026, 571, '0', 0, 3739.33, 3566.95, 341.567, 0.242477, 0, 0, 0.139173, 0.990268, 300, 100, 0);
diff --git a/sql/updates/world/master/2020_06_14_06_world_2017_05_13_01_world.sql b/sql/updates/world/master/2020_06_14_06_world_2017_05_13_01_world.sql
new file mode 100644
index 00000000000..fe3be6bf9ed
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_06_world_2017_05_13_01_world.sql
@@ -0,0 +1,77 @@
+SET @OGUID:=47713;
+
+DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+72;
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnDifficulties`, `PhaseId`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`) VALUES
+(@OGUID+0 , 176563, 450, 0, 0, '0', 0, -40.41246, 16.34629, -5.145579, 3.455756, 0, 0, -0.9876881, 0.1564362, 7200, 255, 1, '', 23706), -- 176563 (Area: 2917)
+(@OGUID+1 , 176566, 450, 0, 0, '0', 0, 206.6491, 66.07558, 25.40491, 3.604106, 0, 0, -0.9733791, 0.2292009, 7200, 255, 0, '', 23706), -- 176566 (Area: 2917)
+(@OGUID+2 , 112317, 560, 0, 0, '1,2', 0, 1794.44, 1112.927, 12.46013, 6.204648, 0, 0, -0.03925896, 0.9992291, 7200, 255, 1, '', 23706), -- 112317 (Area: 2369)
+(@OGUID+3 , 112316, 560, 0, 0, '1,2', 0, 1795.41, 1111.976, 12.46013, 1.579522, 0, 0, 0.7101851, 0.704015, 7200, 255, 1, '', 23706), -- 112316 (Area: 2369)
+(@OGUID+4 , 112319, 560, 0, 0, '1,2', 0, 1808.012, 1112.328, 13.47555, 4.782205, 0, 0, -0.6819973, 0.7313547, 7200, 255, 1, '', 23706), -- 112319 (Area: 2369)
+(@OGUID+5 , 112321, 560, 0, 0, '1,2', 0, 1802.565, 1112.28, 13.47555, 4.721118, 0, 0, -0.7040138, 0.7101862, 7200, 255, 1, '', 23706), -- 112321 (Area: 2369)
+(@OGUID+6 , 22910, 560, 0, 0, '1,2', 0, 1820.542, 1044.187, 18.65778, 4.71239, 0, 0, -0.7071066, 0.7071069, 7200, 255, 1, '', 23706), -- 22910 (Area: 2369)
+(@OGUID+7 , 22921, 560, 0, 0, '1,2', 0, 1801.726, 1034.977, 11.06904, 5.558876, 0, 0, -0.35429, 0.9351356, 7200, 255, 1, '', 23706), -- 22921 (Area: 2369)
+(@OGUID+8 , 22923, 560, 0, 0, '1,2', 0, 1808.022, 1035.029, 11.06904, 4.057892, 0, 0, -0.8968725, 0.4422892, 7200, 255, 1, '', 23706), -- 22923 (Area: 2369)
+(@OGUID+9 , 22922, 560, 0, 0, '1,2', 0, 1803.098, 1035.267, 11.06904, 4.729844, 0, 0, -0.7009087, 0.7132511, 7200, 255, 1, '', 23706), -- 22922 (Area: 2369)
+(@OGUID+10, 22925, 560, 0, 0, '1,2', 0, 1804.703, 1035.279, 11.06904, 4.729844, 0, 0, -0.7009087, 0.7132511, 7200, 255, 1, '', 23706), -- 22925 (Area: 2369)
+(@OGUID+11, 22924, 560, 0, 0, '1,2', 0, 1806.315, 1035.295, 11.06904, 4.598942, 0, 0, -0.7460575, 0.6658815, 7200, 255, 1, '', 23706), -- 22924 (Area: 2369)
+(@OGUID+12, 22927, 560, 0, 0, '1,2', 0, 1818.748, 1044.187, 18.65778, 4.71239, 0, 0, -0.7071066, 0.7071069, 7200, 255, 1, '', 23706), -- 22927 (Area: 2369)
+(@OGUID+13, 22926, 560, 0, 0, '1,2', 0, 1801.52, 1033.646, 11.06904, 0.02617911, 0, 0, 0.01308918, 0.9999143, 7200, 255, 1, '', 23706), -- 22926 (Area: 2369)
+(@OGUID+14, 184305, 560, 0, 0, '1,2', 0, 1818.346, 1031.224, 11.09751, 3.124123, 0, 0, 0.9999619, 0.008734641, 7200, 255, 1, '', 23706), -- 184305 (Area: 2369)
+(@OGUID+15, 180570, 560, 0, 0, '1,2', 0, 1808.454, 1022.87, 13.71209, 1.518436, 0, 0, 0.6883545, 0.7253745, 7200, 255, 1, '', 23706), -- 180570 (Area: 2369)
+(@OGUID+16, 184332, 560, 0, 0, '1,2', 0, 1819.035, 1023.37, 19.71265, 4.729844, 0, 0, -0.7009087, 0.7132511, 7200, 255, 1, '', 23706), -- 184332 (Area: 2369
+(@OGUID+17, 22673, 560, 0, 0, '1,2', 0, 1885.541, 1103.728, 18.91458, 2.495818, 0, 0, 0.9483232, 0.3173059, 7200, 255, 1, '', 23706), -- 22673 (Area: 2369)
+(@OGUID+18, 22672, 560, 0, 0, '1,2', 0, 1886.727, 1103.384, 18.91458, 1.204277, 0, 0, 0.5664063, 0.8241262, 7200, 255, 1, '', 23706), -- 22672 (Area: 2369)
+(@OGUID+19, 22674, 560, 0, 0, '1,2', 0, 1885.833, 1103.073, 18.91458, 5.297076, 0, 0, -0.4733191, 0.8808911, 7200, 255, 1, '', 23706), -- 22674 (Area: 2369)
+(@OGUID+20, 22685, 560, 0, 0, '1,2', 0, 1892.805, 1090.597, 23.63159, 2.513274, 0, 0, 0.9510565, 0.3090171, 7200, 255, 1, '', 23706), -- 22685 (Area: 2369)
+(@OGUID+21, 22684, 560, 0, 0, '1,2', 0, 1890.807, 1087.847, 23.63159, 2.513274, 0, 0, 0.9510565, 0.3090171, 7200, 255, 1, '', 23706), -- 22684 (Area: 2369)
+(@OGUID+22, 22671, 560, 0, 0, '1,2', 0, 1886.854, 1103.559, 23.83143, 1.204277, 0, 0, 0.5664063, 0.8241262, 7200, 255, 1, '', 23706), -- 22671 (Area: 2369)
+(@OGUID+23, 22670, 560, 0, 0, '1,2', 0, 1885.96, 1103.248, 23.83143, 5.297076, 0, 0, -0.4733191, 0.8808911, 7200, 255, 1, '', 23706), -- 22670 (Area: 2369)
+(@OGUID+24, 112305, 560, 0, 0, '1,2', 0, 1792.475, 1129.977, 13.47555, 4.799657, 0, 0, -0.6755896, 0.7372779, 7200, 255, 1, '', 23706), -- 112305 (Area: 2369)
+(@OGUID+25, 112309, 560, 0, 0, '1,2', 0, 1788.27, 1129.94, 13.47555, 4.756022, 0, 0, -0.6915131, 0.7223639, 7200, 255, 1, '', 23706), -- 112309 (Area: 2369)
+(@OGUID+26, 112308, 560, 0, 0, '1,2', 0, 1790.442, 1129.959, 13.47555, 4.677484, 0, 0, -0.7193394, 0.6946588, 7200, 255, 1, '', 23706), -- 112308 (Area: 2369)
+(@OGUID+27, 112311, 560, 0, 0, '1,2', 0, 1807.419, 1117.274, 13.47555, 1.50098, 0, 0, 0.6819973, 0.7313547, 7200, 255, 1, '', 23706), -- 112311 (Area: 2369)
+(@OGUID+28, 112310, 560, 0, 0, '1,2', 0, 1805.387, 1117.256, 13.47555, 1.64061, 0, 0, 0.7313538, 0.6819983, 7200, 255, 1, '', 23706), -- 112310 (Area: 2369)
+(@OGUID+29, 112312, 560, 0, 0, '1,2', 0, 1809.591, 1117.293, 13.47555, 1.579522, 0, 0, 0.7101851, 0.704015, 7200, 255, 1, '', 23706), -- 112312 (Area: 2369)
+(@OGUID+30, 112301, 560, 0, 0, '1,2', 0, 1805.231, 1130.088, 13.47555, 4.721118, 0, 0, -0.7040138, 0.7101862, 7200, 255, 1, '', 23706), -- 112301 (Area: 2369)
+(@OGUID+31, 112303, 560, 0, 0, '1,2', 0, 1809.436, 1130.125, 13.47555, 4.721118, 0, 0, -0.7040138, 0.7101862, 7200, 255, 1, '', 23706), -- 112303 (Area: 2369)
+(@OGUID+32, 112302, 560, 0, 0, '1,2', 0, 1807.403, 1130.107, 13.47555, 4.81711, 0, 0, -0.6691303, 0.743145, 7200, 255, 1, '', 23706), -- 112302 (Area: 2369)
+(@OGUID+33, 174995, 560, 0, 0, '1,2', 0, 1876.241, 1105.719, 18.84545, 5.654869, 0, 0, -0.3090162, 0.9510568, 7200, 255, 1, '', 23706), -- 174995 (Area: 2369)
+(@OGUID+34, 174994, 560, 0, 0, '1,2', 0, 1874.842, 1103.794, 18.84545, 5.654869, 0, 0, -0.3090162, 0.9510568, 7200, 255, 1, '', 23706), -- 174994 (Area: 2369)
+(@OGUID+35, 174997, 560, 0, 0, '1,2', 0, 1879.806, 1104.808, 18.84545, 4.084071, 0, 0, -0.8910065, 0.4539906, 7200, 255, 1, '', 23706), -- 174997 (Area: 2369)
+(@OGUID+36, 174996, 560, 0, 0, '1,2', 0, 1878.052, 1106.083, 18.84545, 4.084071, 0, 0, -0.8910065, 0.4539906, 7200, 255, 1, '', 23706), -- 174996 (Area: 2369)
+(@OGUID+37, 174998, 560, 0, 0, '1,2', 0, 1881.476, 1103.594, 18.84545, 4.084071, 0, 0, -0.8910065, 0.4539906, 7200, 255, 1, '', 23706), -- 174998 (Area: 2369)
+(@OGUID+38, 112322, 560, 0, 0, '1,2', 0, 1781.195, 1123.755, 13.47555, 0.04363215, 0, 0, 0.02181435, 0.9997621, 7200, 255, 1, '', 23706), -- 112322 (Area: 2369)
+(@OGUID+39, 22904, 560, 0, 0, '1,2', 0, 1822.65, 1035.223, 18.54309, 4.372049, 0, 0, -0.8166418, 0.5771448, 7200, 255, 1, '', 23706), -- 22904 (Area: 2369)
+(@OGUID+40, 22909, 560, 0, 0, '1,2', 0, 1813.019, 1022.755, 18.65778, 0.1919871, 0, 0, 0.09584618, 0.9953961, 7200, 255, 1, '', 23706), -- 22909 (Area: 2369)
+(@OGUID+41, 22908, 560, 0, 0, '1,2', 0, 1821.753, 1023.72, 11.70037, 3.900813, 0, 0, -0.9288092, 0.3705584, 7200, 255, 1, '', 23706), -- 22908 (Area: 2369)
+(@OGUID+42, 36977, 560, 0, 0, '1,2', 0, 1883.635, 1096.758, 18.84545, 5.654869, 0, 0, -0.3090162, 0.9510568, 7200, 255, 1, '', 23706), -- 36977 (Area: 2369)
+(@OGUID+43, 3803, 560, 0, 0, '1,2', 0, 1847.715, 1112.489, 16.38847, 1.771508, 0, 0, 0.7743921, 0.632706, 7200, 255, 1, '', 23706), -- 3803 (Area: 2369)
+(@OGUID+44, 3804, 560, 0, 0, '1,2', 0, 1846.83, 1112.615, 16.38847, 3.063024, 0, 0, 0.9992285, 0.03927403, 7200, 255, 1, '', 23706), -- 3804 (Area: 2369)
+(@OGUID+45, 22915, 560, 0, 0, '1,2', 0, 1820.176, 1023.963, 11.70037, 4.729844, 0, 0, -0.7009087, 0.7132511, 7200, 255, 1, '', 23706), -- 22915 (Area: 2369)
+(@OGUID+46, 22915, 560, 0, 0, '1,2', 0, 1820.176, 1023.963, 11.70037, 4.729844, 0, 0, -0.7009087, 0.7132511, 7200, 255, 1, '', 23706), -- 22915 (Area: 2369)
+(@OGUID+47, 22917, 560, 0, 0, '1,2', 0, 1821.696, 1020.943, 11.70037, 2.347464, 0, 0, 0.9222002, 0.3867128, 7200, 255, 1, '', 23706), -- 22917 (Area: 2369)
+(@OGUID+48, 22916, 560, 0, 0, '1,2', 0, 1818.501, 1023.7, 11.70037, 5.297076, 0, 0, -0.4733191, 0.8808911, 7200, 255, 1, '', 23706), -- 22916 (Area: 2369)
+(@OGUID+49, 22919, 560, 0, 0, '1,2', 0, 1822.449, 1032.6, 18.54309, 1.928588, 0, 0, 0.8216467, 0.5699971, 7200, 255, 1, '', 23706), -- 22919 (Area: 2369)
+(@OGUID+50, 22918, 560, 0, 0, '1,2', 0, 1820.166, 1020.634, 11.70037, 1.544616, 0, 0, 0.6977901, 0.7163023, 7200, 255, 1, '', 23706), -- 22918 (Area: 2369)
+(@OGUID+51, 22920, 560, 0, 0, '1,2', 0, 1818.606, 1020.993, 11.70037, 1.178098, 0, 0, 0.5555706, 0.8314694, 7200, 255, 1, '', 23706), -- 22920 (Area: 2369)
+(@OGUID+52, 3803, 560, 0, 0, '1,2', 0, 1849.74, 1032.096, 16.34453, 5.131269, 0, 0, -0.5446386, 0.8386708, 7200, 255, 1, '', 23706), -- 3803 (Area: 2369)
+(@OGUID+53, 3804, 560, 0, 0, '1,2', 0, 1850.632, 1032.164, 16.34453, 0.1396245, 0, 0, 0.06975555, 0.9975641, 7200, 255, 1, '', 23706), -- 3804 (Area: 2369)
+(@OGUID+54, 38147, 560, 0, 0, '1,2', 0, 1815.941, 1012.808, 18.54309, 1.230456, 0, 0, 0.5771446, 0.816642, 7200, 255, 1, '', 23706), -- 38147 (Area: 2369)
+(@OGUID+55, 23013, 560, 0, 0, '1,2', 0, 1989.882, 1163.661, 31.64357, 2.539454, 0, 0, 0.95502, 0.2965415, 7200, 255, 1, '', 23706), -- 23013 (Area: 2369)
+(@OGUID+56, 23015, 560, 0, 0, '1,2', 0, 1982.852, 1180.465, 31.61295, 5.358162, 0, 0, -0.4461975, 0.8949345, 7200, 255, 1, '', 23706), -- 23015 (Area: 2369)
+(@OGUID+57, 23014, 560, 0, 0, '1,2', 0, 1991.932, 1166.378, 31.64357, 3.176533, 0, 0, -0.9998474, 0.01746928, 7200, 255, 1, '', 23706), -- 23014 (Area: 2
+(@OGUID+58, 4087, 560, 0, 0, '1,2', 0, 2095.073, 1633.465, 49.88202, 1.605702, 0, 0, 0.7193394, 0.6946588, 7200, 255, 1, '', 23706), -- 4087 (Area: 0)
+(@OGUID+59, 4089, 560, 0, 0, '1,2', 0, 2088.648, 1645.305, 49.88202, 0.165805, 0, 0, 0.08280754, 0.9965656, 7200, 255, 1, '', 23706), -- 4089 (Area: 0)
+(@OGUID+60, 4088, 560, 0, 0, '1,2', 0, 2094.378, 1646.551, 49.88202, 4.415687, 0, 0, -0.8038559, 0.5948241, 7200, 255, 1, '', 23706), -- 4088 (Area: 0)
+(@OGUID+61, 4090, 560, 0, 0, '1,2', 0, 2094.719, 1639.939, 48.07408, 5.654869, 0, 0, -0.3090162, 0.9510568, 7200, 255, 1, '', 23706), -- 4090 (Area: 0
+(@OGUID+62, 22603, 560, 0, 0, '1,2', 0, 2329.611, 1608.566, 60.49135, 5.873035, 0, 0, -0.2036409, 0.9790456, 7200, 255, 1, '', 23706), -- 22603 (Area: 0)
+(@OGUID+63, 22602, 560, 0, 0, '1,2', 0, 2329.339, 1609.473, 60.49135, 3.68265, 0, 0, -0.9636297, 0.267241, 7200, 255, 1, '', 23706), -- 22602 (Area: 0)
+(@OGUID+64, 22605, 560, 0, 0, '1,2', 0, 2329.837, 1609.87, 55.5745, 0.8813897, 0, 0, 0.426568, 0.9044555, 7200, 255, 1, '', 23706), -- 22605 (Area: 0)
+(@OGUID+65, 22604, 560, 0, 0, '1,2', 0, 2329.442, 1608.7, 55.5745, 5.873035, 0, 0, -0.2036409, 0.9790456, 7200, 255, 1, '', 23706), -- 22604 (Area: 0)
+(@OGUID+66, 22606, 560, 0, 0, '1,2', 0, 2329.17, 1609.607, 55.5745, 3.68265, 0, 0, -0.9636297, 0.267241, 7200, 255, 1, '', 23706), -- 22606 (Area: 0)
+(@OGUID+67, 3799, 560, 0, 0, '1,2', 0, 2223.475, 1484.469, 54.98195, 5.087637, 0, 0, -0.5628042, 0.8265902, 7200, 255, 1, '', 23706), -- 3799 (Area: 0)
+(@OGUID+68, 3800, 560, 0, 0, '1,2', 0, 2224.369, 1484.498, 54.98195, 0.09599175, 0, 0, 0.04797745, 0.9988484, 7200, 255, 1, '', 23706), -- 3800 (Area:
+(@OGUID+69, 123244, 560, 0, 0, '1,2', 0, 2101.137, 1641.488, 49.88202, 3.089183, 0, 0, 0.9996567, 0.02620165, 7200, 255, 1, '', 23706), -- 123244 (Area: 0)
+(@OGUID+70, 3799, 560, 0, 0, '1,2', 0, 2116.721, 1483.125, 46.51685, 4.965463, 0, 0, -0.6122169, 0.7906898, 7200, 255, 1, '', 23706), -- 3799 (Area: 0)
+(@OGUID+71, 3800, 560, 0, 0, '1,2', 0, 2117.612, 1483.045, 46.51685, 6.257006, 0, 0, -0.01308918, 0.9999143, 7200, 255, 1, '', 23706), -- 3800 (Area: 0)
+(@OGUID+72, 176308, 329, 0, 0, '1', 0, 3659.384, -3305.042, 127.0623, 5.009095, 0, 0, -0.5948229, 0.8038568, 7200, 255, 1, '', 23706); -- 176308 (Area: 5917)
diff --git a/sql/updates/world/master/2020_06_14_07_world_2017_05_14_00_world_335.sql b/sql/updates/world/master/2020_06_14_07_world_2017_05_14_00_world_335.sql
new file mode 100644
index 00000000000..2ac3d7bc207
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_07_world_2017_05_14_00_world_335.sql
@@ -0,0 +1,4 @@
+-- add text for use in boss_apothecary_hummel.cpp
+DELETE FROM `creature_text` WHERE `CreatureID`=36296 AND `GroupID`=6 AND `ID`=0;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(36296,6,0,"Apothecaries! Give your life for the Crown!",12,0,100,0,0,0,38594,3,'SAY_SUMMON_ADDS');
diff --git a/sql/updates/world/master/2020_06_14_08_world_2017_05_14_01_world.sql b/sql/updates/world/master/2020_06_14_08_world_2017_05_14_01_world.sql
new file mode 100644
index 00000000000..21f69cdf106
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_08_world_2017_05_14_01_world.sql
@@ -0,0 +1 @@
+UPDATE `smart_scripts` SET `target_type`=8 WHERE `entryorguid`=2731600 AND `source_type`=9 AND `id` IN(2,3);
diff --git a/sql/updates/world/master/2020_06_14_09_world_2017_05_16_01_world.sql b/sql/updates/world/master/2020_06_14_09_world_2017_05_16_01_world.sql
new file mode 100644
index 00000000000..8e0718846b3
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_09_world_2017_05_16_01_world.sql
@@ -0,0 +1,210 @@
+/*
+ * Thorim
+ */
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (32865,32872,32873,33196);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextID`, `comment`) VALUES
+-- Thorim
+(32865, 0,0,'Interlopers! You mortals who dare to interfere with my sport will pay... Wait--you...',14,0,100,0,0,15733,33145,'Thorim SAY_AGGRO_1'),
+(32865, 1,0,'I remember you... In the mountains... But you... what is this? Where am--',14,0,100,0,0,15734,33270,'Thorim SAY_AGGRO_2'),
+(32865, 2,0,'Do not hold back! Destroy them!',14,0,100,0,0,15736,34241,'Thorim SAY_SPECIAL'),
+(32865, 3,0,'Impertinent whelps, you dare challenge me atop my pedestal? I will crush you myself!',14,0,100,0,0,15738,33148,'Thorim SAY_JUMPDOWN'),
+(32865, 4,0,'Can''t you at least put up a fight!?',14,0,100,0,0,15739,34239,'Thorim SAY_SLAY_1'),
+(32865, 4,1,'Pathetic.',14,0,100,0,0,15740,35768,'Thorim SAY_SLAY_2'),
+(32865, 5,0,'My patience has reached its limit!',14,0,100,0,0,15741,33365,'Thorim SAY_BERSERK'),
+(32865, 6,0,'Failures! Weaklings!',14,0,100,0,0,15742,33274,'Thorim SAY_WIPE'),
+(32865, 7,0,'Stay your arms! I yield!',14,0,100,0,0,15743,33948,'Thorim SAY_DEATH'),
+(32865, 8,0,'I feel as though I am awakening from a nightmare, but the shadows in this place yet linger.',14,0,100,0,0,15744,33949,'Thorim SAY_END_NORMAL_1'),
+(32865, 9,0,'Sif... was Sif here? Impossible--she died by my brother''s hand. A dark nightmare indeed....',14,0,100,0,0,15745,33950,'Thorim SAY_END_NORMAL_2'),
+(32865,10,0,'I need time to reflect.... I will aid your cause if you should require it. I owe you at least that much. Farewell.',14,0,100,0,0,15746,33951,'Thorim SAY_END_NORMAL_3'),
+(32865,11,0,'You! Fiend! You are not my beloved! Be gone!',14,0,100,0,0,15747,33952,'Thorim SAY_END_HARD_1'),
+(32865,12,0,'Behold the hand behind all the evil that has befallen Ulduar, left my kingdom in ruins, corrupted my brother, and slain my wife.',14,0,100,0,0,15748,33953,'Thorim SAY_END_HARD_2'),
+(32865,13,0,'And now it falls to you, champions, to avenge us all. The task before you is great, but I will lend you my aid as I am able. You must prevail.',14,0,100,0,0,15749,33954,'Thorim SAY_END_HARD_3'),
+-- Runic Colossus
+(32872, 0,0,'%s surrounds itself with a crackling Runic Barrier!',41,0,100,0,0,0,33267,'Runic Colossus'),
+-- Ancient Rune Giant
+(32873, 0,0,'%s fortifies nearby allies with runic might!',41,0,100,0,0,0,33523,'Ancient Rune Giant'),
+-- Sif
+(33196, 0,0,'Thorim, my lord! Why else would these invaders have come into your sanctum but to slay you? They must be stopped!',14,0,100,0,0,15668,33325,'Sif - Start'),
+(33196, 1,0,'These pathetic mortals are harmless, beneath my station. Dispose of them!',14,0,100,0,0,15669,33368,'Sif - Despawn'),
+(33196, 2,0,'Impossible! Lord Thorim, I will bring your foes a frigid death!',14,0,100,0,0,15670,33369,'Sif - Event');
+
+-- Lever SAI
+SET @ENTRY := 194264;
+UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry`=@ENTRY;
+UPDATE `gameobject_template_addon` SET `flags`=32 WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=1;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,34155,0,0,0,0,0,0,'Lever - On Gameobject State Changed - Activate Gameobject');
+
+-- Thorim Trap Bunny SAI
+SET @ENTRY := 33054;
+UPDATE `creature_template` SET `AIName`='SmartAI', `flags_extra`=2 WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,10,0,100,0,0,12,17000,17000,11,62241,0,0,0,0,0,1,0,0,0,0,0,0,0,'Thorim Trap Bunny - Within 0-12 Range Out of Combat LoS - Cast Paralytic Field');
+
+SET @ENTRY := 33725;
+UPDATE `creature_template` SET `AIName`='SmartAI', `flags_extra`=2 WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,10,0,100,0,0,12,17000,17000,11,63540,0,0,0,0,0,1,0,0,0,0,0,0,0,'Thorim Trap Bunny - Within 0-12 Range Out of Combat LoS - Cast Paralytic Field');
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_thorim_blizzard_effect','spell_thorim_frostbolt_volley','spell_thorim_charge_orb','spell_thorim_runic_smash','spell_thorim_stormhammer','spell_thorim_lightning_charge','spell_thorim_stormhammer_sif','spell_thorim_stormhammer_boomerang','spell_thorim_activate_lightning_orb_periodic','spell_iron_ring_guard_impale','spell_thorim_arena_leap');
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(62576,'spell_thorim_blizzard_effect'),
+(62602,'spell_thorim_blizzard_effect'),
+(62580,'spell_thorim_frostbolt_volley'),
+(62604,'spell_thorim_frostbolt_volley'),
+(62016,'spell_thorim_charge_orb'),
+(62057,'spell_thorim_runic_smash'),
+(62058,'spell_thorim_runic_smash'),
+(62042,'spell_thorim_stormhammer'),
+(62466,'spell_thorim_lightning_charge'),
+(64767,'spell_thorim_stormhammer_sif'),
+(64909,'spell_thorim_stormhammer_boomerang'),
+(62184,'spell_thorim_activate_lightning_orb_periodic'),
+(62331,'spell_iron_ring_guard_impale'),
+(62418,'spell_iron_ring_guard_impale'),
+(61934,'spell_thorim_arena_leap');
+
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=62042;
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = -62320;
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
+(-62320, -62398, 0, 'Aura of Celerity - Remove Visual');
+
+UPDATE `creature_template` SET `ScriptName`='boss_thorim' WHERE `entry`=32865;
+UPDATE `creature_template` SET `ScriptName`='npc_sif' WHERE `entry`=33196;
+UPDATE `creature_template` SET `ScriptName`='npc_thorim_pre_phase' WHERE `entry` IN (32885,32883,32908,32907,32882,32886);
+UPDATE `creature_template` SET `ScriptName`='npc_thorim_arena_phase' WHERE `entry` IN (32876,32904,32878,32877,32874,32875,33110);
+UPDATE `creature_template` SET `ScriptName`='npc_runic_colossus' WHERE `entry`=32872;
+UPDATE `creature_template` SET `ScriptName`='npc_ancient_rune_giant' WHERE `entry`=32873;
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|0x40000000 WHERE `entry` IN (32872, 32873, 33148, 33149);
+UPDATE `creature_template` SET `difficulty_entry_1`=33150 WHERE `entry`=32908; -- Swapped Difficulty entry npcs
+UPDATE `creature_template` SET `difficulty_entry_1`=33151 WHERE `entry`=32907; -- Caused swapped displayIDs in 25n
+UPDATE `creature_template` SET `InhabitType`=4, `flags_extra`=128, `ScriptName`='' WHERE `entry` IN (33140,33141);
+UPDATE `creature_template` SET `InhabitType`=4, `flags_extra`=128 WHERE `entry` IN (33378,32879);
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry` IN (32892);
+UPDATE `creature_template` SET `faction`=1692 WHERE `entry` IN (32885,32883,33152,33153,32908,33150,32907,33151);
+UPDATE `creature_template` SET `faction`=1693 WHERE `entry` IN (32882,33154);
+UPDATE `creature_template` SET `speed_walk`=2.5/2.5, `speed_run`=14.0/7.0, `BaseAttackTime`=1500, `RangeAttackTime`=1500, `flags_extra`=`flags_extra`|0x00000200 WHERE `entry` IN (32865,33147);
+
+SET @THORIM_BLIZZARD_BUNNY := 136515;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (62577,62603,62016,62976,63238,64098,62466,62565,62942,64767,62560,61964,61934);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 1, 62577, 0, 0, 31, 0, 3, 32892, @THORIM_BLIZZARD_BUNNY, 0, 0, 0, '', 'Spell Blizzard (effect 0) will hit the potential target of the spell if target is unit Thorim Event Bunny guid 136515.'),
+(13, 1, 62603, 0, 0, 31, 0, 3, 32892, @THORIM_BLIZZARD_BUNNY, 0, 0, 0, '', 'Spell Blizzard (effect 0) will hit the potential target of the spell if target is unit Thorim Event Bunny guid 136515.'),
+(13, 1, 62016, 0, 0, 31, 0, 3, 33378, 0, 0, 0, 0, '', 'Spell Charge Orb (effect 0) will hit the potential target of the spell if target is unit Thunder Orb.'),
+(13, 1, 62976, 0, 0, 31, 0, 3, 33378, 0, 0, 0, 0, '', 'Spell Lightning Pillar (effect 0) will hit the potential target of the spell if target is unit Thunder Orb.'),
+(13, 1, 62976, 0, 0, 33, 0, 1, 0, 0, 1, 0, 0, '', 'Spell Lightning Pillar (effect 0) will hit the potential target of the spell if target is not the same as condition target.'),
+(13, 1, 63238, 0, 0, 31, 0, 3, 33378, 0, 0, 0, 0, '', 'Spell Lightning Pillar (effect 0) will hit the potential target of the spell if target is unit Thunder Orb.'),
+(13, 1, 63238, 0, 0, 33, 0, 1, 0, 0, 1, 0, 0, '', 'Spell Lightning Pillar (effect 0) will hit the potential target of the spell if target is not the same as condition target.'),
+(13, 1, 64098, 0, 0, 31, 0, 3, 32865, 0, 0, 0, 0, '', 'Spell Lightning Bolt (effect 0) will hit the potential target of the spell if target is unit Thorim.'),
+(13, 4, 62466, 0, 0, 31, 0, 3, 32780, 0, 0, 0, 0, '', 'Spell Lightning Charge (effect 2) will hit the potential target of the spell if target is unit Invisible Stalker (All Phases).'),
+(13, 3, 62565, 0, 0, 31, 0, 3, 32865, 0, 0, 0, 0, '', 'Spell Touch of Dominion (effects 0 & 1) will hit the potential target of the spell if target is unit Thorim.'),
+(13, 7, 62942, 0, 0, 31, 0, 3, 32874, 0, 0, 0, 0, '', 'Spell Runic Fortification (effect 0 & 1 & 2) will hit the potential target of the spell if target is unit Iron Ring Guard.'),
+(13, 7, 62942, 0, 1, 31, 0, 3, 32875, 0, 0, 0, 0, '', 'Spell Runic Fortification (effect 0 & 1 & 2) will hit the potential target of the spell if target is unit Iron Honor Guard.'),
+(13, 7, 62942, 0, 2, 31, 0, 3, 33110, 0, 0, 0, 0, '', 'Spell Runic Fortification (effect 0 & 1 & 2) will hit the potential target of the spell if target is unit Dark Rune Acolyte.'),
+(13, 1, 64767, 0, 0, 31, 0, 3, 33196, 0, 0, 0, 0, '', 'Spell Stormhammer (effect 0) will hit the potential target of the spell if target is unit Sif.'),
+(13, 7, 62560, 0, 0, 31, 0, 3, 32876, 0, 0, 0, 0, '', 'Spell Berserk (effect 0 & 1 & 2) will hit the potential target of the spell if target is unit Dark Rune Champion.'),
+(13, 7, 62560, 0, 1, 31, 0, 3, 32877, 0, 0, 0, 0, '', 'Spell Berserk (effect 0 & 1 & 2) will hit the potential target of the spell if target is unit Dark Rune Warbringer.'),
+(13, 7, 62560, 0, 2, 31, 0, 3, 32878, 0, 0, 0, 0, '', 'Spell Berserk (effect 0 & 1 & 2) will hit the potential target of the spell if target is unit Dark Rune Evoker.'),
+(13, 7, 62560, 0, 3, 31, 0, 3, 32904, 0, 0, 0, 0, '', 'Spell Berserk (effect 0 & 1 & 2) will hit the potential target of the spell if target is unit Dark Rune Commoner.'),
+(13, 1, 61964, 0, 0, 31, 0, 3, 32882, 0, 0, 0, 0, '', 'Spell Circle of Healing (effect 0) will hit the potential target of the spell if target is unit Jormungar Behemoth.'),
+(13, 1, 61964, 0, 1, 31, 0, 3, 32883, 0, 0, 0, 0, '', 'Spell Circle of Healing (effect 0) will hit the potential target of the spell if target is unit Captured Mercenary Soldier.'),
+(13, 1, 61964, 0, 2, 31, 0, 3, 32885, 0, 0, 0, 0, '', 'Spell Circle of Healing (effect 0) will hit the potential target of the spell if target is unit Captured Mercenary Soldier.'),
+(13, 1, 61964, 0, 3, 31, 0, 3, 32886, 0, 0, 0, 0, '', 'Spell Circle of Healing (effect 0) will hit the potential target of the spell if target is unit Dark Rune Acolyte.'),
+(13, 1, 61964, 0, 4, 31, 0, 3, 32907, 0, 0, 0, 0, '', 'Spell Circle of Healing (effect 0) will hit the potential target of the spell if target is unit Captured Mercenary Captain.'),
+(13, 1, 61964, 0, 5, 31, 0, 3, 32908, 0, 0, 0, 0, '', 'Spell Circle of Healing (effect 0) will hit the potential target of the spell if target is unit Captured Mercenary Captain.'),
+(13, 1, 61934, 0, 0, 31, 0, 3, 32892, 0, 0, 0, 0, 'condition_thorim_arena_leap', 'Spell Leap (effect 0) will hit the potential target of the spell if target is unit Thorim Event Bunny.'),
+(13, 1, 61934, 0, 0, 31, 0, 3, 32892, @THORIM_BLIZZARD_BUNNY, 1, 0, 0, '', 'Spell Leap (effect 0) will hit the potential target of the spell if target is not unit Thorim Event Bunny guid 136515.');
+
+DELETE FROM `disables` WHERE `sourceType`=0 AND `entry` IN (62042,64767,45537);
+INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, `comment`) VALUES
+(0, 62042, 64, '', '', 'Stormhammer - Ignore LOS'),
+(0, 64767, 64, '', '', 'Stormhammer - Ignore LOS'),
+(0, 45537, 64, '', '', 'Lightning Beam Channel - Ignore LOS');
+
+DELETE FROM `creature` WHERE `id` IN (32882,32908,32907,32885,32883,32886); -- PreAdds
+DELETE FROM `creature` WHERE `id` IN (32874,32875,33110); -- Colossus, Giant Adds
+
+-- Fix Thorim Controller multi spawns
+SET @CGUID:=136446;
+DELETE FROM `creature` WHERE `id`=32879;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnDifficulties`, `PhaseId`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES
+(@CGUID, 32879, 603, '14,33', 0, 2134.774, -262.3073, 428.6936, 1.343904, 7200, 0, 0); -- 32879 (Area: 0) (Auras: 62184 - 62184)
+
+UPDATE `gameobject_template` SET `size`=3 WHERE `entry`=194315;
+UPDATE `gameobject_template_addon` SET `faction`=94, `flags`=16 WHERE `entry` IN (194313,194314,194315);
+
+SET @OGUID := 3926; -- 4 free guids
+DELETE FROM `gameobject` WHERE `id` IN (194312,194313,194314,194315);
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnDifficulties`, `PhaseId`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) values
+(@OGUID+0,194312,603,'14',0,2134.948,-286.436,419.5051,1.588249,0,0,0.7132502,0.7009096,-604800,255,1,0),
+(@OGUID+1,194313,603,'14',0,2134.948,-286.436,419.5051,1.588249,0,0,0.7132502,0.7009096,-604800,255,1,0),
+(@OGUID+2,194314,603,'33',0,2134.948,-286.436,419.5051,1.588249,0,0,0.7132502,0.7009096,-604800,255,1,0),
+(@OGUID+3,194315,603,'33',0,2134.948,-286.436,419.5051,1.588249,0,0,0.7132502,0.7009096,-604800,255,1,0);
+
+UPDATE `gameobject_loot_template` SET `LootMode`=1 WHERE `Entry`=27074;
+DELETE FROM `gameobject_loot_template` WHERE `Entry` IN (26955,26956);
+INSERT INTO `gameobject_loot_template` (`Entry`,`Item`,`Reference`,`Chance`,`QuestRequired`,`LootMode`,`GroupId`,`MinCount`,`MaxCount`,`Comment`) VALUES
+(26955,1,34372,100,0,1,0,1,1,'Thorim25 HM - normal mode loot'),
+(26955,2,12033,100,0,1,0,1,2,'Thorim25 HM - T8.5 tokens'),
+(26955,3,34154,10,0,1,0,1,1,'Thorim25 HM - Random Ulduar craft recipe'),
+(26955,45038,0,18,0,1,0,1,1,'Thorim25 HM - Val''anyr fragment'),
+(26955,45087,0,10,0,1,0,1,1,'Thorim25 HM - Runed Orb'),
+(26955,45470,0,0,0,1,1,1,1,'Thorim25 HM - Wisdom''s Hold'),
+(26955,45471,0,0,0,1,1,1,1,'Thorim25 HM - Fate''s Clutch'),
+(26955,45472,0,0,0,1,1,1,1,'Thorim25 HM - Warhelm of the Champion'),
+(26955,45473,0,0,0,1,1,1,1,'Thorim25 HM - Embrace of the Gladiator'),
+(26955,45474,0,0,0,1,1,1,1,'Thorim25 HM - Pauldrons of the Combatant'),
+(26955,45570,0,0,0,1,1,1,1,'Thorim25 HM - Skyforge Crossbow'),
+(26955,45817,0,100,1,1,0,1,1,'Thorim25 HM - Thorim''s Sigil'),
+(26955,47241,0,100,0,1,0,1,1,'Thorim25 HM - Emblem of Triumph'),
+
+(26956,1,34372,100,0,1,0,1,1,'Thorim25 - normal mode loot'),
+(26956,2,12033,100,0,1,0,1,2,'Thorim25 - T8.5 tokens'),
+(26956,3,34154,10,0,1,0,1,1,'Thorim25 - Random Ulduar craft recipe'),
+(26956,45038,0,8,0,1,0,1,1,'Thorim25 - Val''anyr fragment'),
+(26956,45087,0,10,0,1,0,1,1,'Thorim25 - Runed Orb'),
+(26956,47241,0,100,0,1,0,1,1,'Thorim25 - Emblem of Triumph');
+
+-- Pathing for Thorim Event Bunny Entry: 32892 'TDB FORMAT'
+SET @PATH := @THORIM_BLIZZARD_BUNNY * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2148.425,`position_y`=-276.7478,`position_z`=419.5923 WHERE `guid`=@THORIM_BLIZZARD_BUNNY;
+DELETE FROM `creature_addon` WHERE `guid`=@THORIM_BLIZZARD_BUNNY;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@THORIM_BLIZZARD_BUNNY,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,2148.425,-276.7478,419.5923,0,0,0,0,100,0),
+(@PATH,2,2145.229,-278.5732,419.6016,0,0,0,0,100,0),
+(@PATH,3,2142.105,-280.7194,419.5932,0,0,0,0,100,0),
+(@PATH,4,2138.419,-281.2838,419.5999,0,0,0,0,100,0),
+(@PATH,5,2134.843,-281.9885,419.5996,0,0,0,0,100,0),
+(@PATH,6,2131.128,-281.278,419.5985,0,0,0,0,100,0),
+(@PATH,7,2127.415,-280.8166,419.5875,0,0,0,0,100,0),
+(@PATH,8,2124.459,-278.4777,419.6088,0,0,0,0,100,0),
+(@PATH,9,2121.098,-276.7148,419.5924,0,0,0,0,100,0),
+(@PATH,10,2119.281,-273.4217,419.6069,0,0,0,0,100,0),
+(@PATH,11,2116.933,-270.4605,419.5851,0,0,0,0,100,0),
+(@PATH,12,2116.359,-266.7142,419.6042,0,0,0,0,100,0),
+(@PATH,13,2115.436,-263.0562,419.5847,0,0,0,0,100,0),
+(@PATH,14,2116.543,-259.411,419.6082,0,0,0,0,100,0),
+(@PATH,15,2116.943,-255.605,419.5851,0,0,0,0,100,0),
+(@PATH,16,2119.377,-252.7493,419.6096,0,0,0,0,100,0),
+(@PATH,17,2121.183,-249.3546,419.5858,0,0,0,0,100,0),
+(@PATH,18,2124.49,-247.5925,419.6089,0,0,0,0,100,0),
+(@PATH,19,2127.329,-245.1714,419.5925,0,0,0,0,100,0),
+(@PATH,20,2131.097,-244.8609,419.6089,0,0,0,0,100,0),
+(@PATH,21,2134.792,-243.7036,419.585,0,0,0,0,100,0),
+(@PATH,22,2138.466,-244.3162,419.5979,0,0,0,0,100,0),
+(@PATH,23,2142.386,-244.7266,419.5746,0,0,0,0,100,0),
+(@PATH,24,2145.455,-247.1502,419.5968,0,0,0,0,100,0),
+(@PATH,25,2148.564,-249.0781,419.5791,0,0,0,0,100,0),
+(@PATH,26,2150.63,-252.4069,419.598,0,0,0,0,100,0),
+(@PATH,27,2153.104,-255.5907,419.5758,0,0,0,0,100,0),
+(@PATH,28,2153.286,-259.4698,419.6053,0,0,0,0,100,0),
+(@PATH,29,2154.193,-263.0425,419.6039,0,0,0,0,100,0),
+(@PATH,30,2153.279,-266.768,419.6026,0,0,0,0,100,0),
+(@PATH,31,2152.758,-270.5462,419.5822,0,0,0,0,100,0),
+(@PATH,32,2150.38,-273.4614,419.605,0,0,0,0,100,0);
diff --git a/sql/updates/world/master/2020_06_14_10_world_2017_05_24_00_world.sql b/sql/updates/world/master/2020_06_14_10_world_2017_05_24_00_world.sql
new file mode 100644
index 00000000000..5d9655ebf49
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_10_world_2017_05_24_00_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `quest_template_addon` SET `PrevQuestID`=12976 WHERE `id`=12977;
diff --git a/sql/updates/world/master/2020_06_14_11_world_2017_05_17_00_world.sql b/sql/updates/world/master/2020_06_14_11_world_2017_05_17_00_world.sql
new file mode 100644
index 00000000000..3b946f6006b
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_11_world_2017_05_17_00_world.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `creature_addon` WHERE `guid` IN (136274,136490,136555);
diff --git a/sql/updates/world/master/2020_06_14_12_world_2017_05_22_00_world.sql b/sql/updates/world/master/2020_06_14_12_world_2017_05_22_00_world.sql
new file mode 100644
index 00000000000..32a484f4dfb
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_12_world_2017_05_22_00_world.sql
@@ -0,0 +1,25 @@
+--
+DELETE FROM `creature` WHERE `guid` IN (79380,79383,79609,79614,79626,79631,79636,79650,79876,79895,79899,79921,80289,80295,80299,80300,80303,80311,80312,80315,80316,80323);
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnDifficulties`, `PhaseId`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `curhealth`, `curmana`, `MovementType`) VALUES
+(79380, 28603, 571, '0', 0, 0, 0, 6022.67, -2049.14, 238.189, 1.46482, 600, 10, 0, 0, 1),
+(79383, 28603, 571, '0', 0, 0, 0, 6042.88, -2119.83, 239.522, 5.55282, 600, 10, 0, 0, 1),
+(79609, 28603, 571, '0', 0, 0, 0, 6101.08, -2157.18, 239.578, 5.52926, 600, 10, 0, 0, 1),
+(79614, 28603, 571, '0', 0, 0, 0, 6176.72, -2208.48, 241.65, 0.110007, 600, 10, 0, 0, 1),
+(79626, 28603, 571, '0', 0, 0, 0, 6227.74, -2193.69, 236.211, 0.663713, 600, 10, 0, 0, 1),
+(79631, 28603, 571, '0', 0, 0, 0, 6270.34, -2053.92, 238.548, 1.23705, 600, 10, 0, 0, 1),
+(79636, 28603, 571, '0', 0, 0, 0, 6069.51, -1913.87, 236.212, 2.78429, 600, 10, 0, 0, 1),
+(79650, 28603, 571, '0', 0, 0, 0, 6017.94, -1903.71, 239.384, 3.56183, 600, 10, 0, 0, 1),
+(79876, 28603, 571, '0', 0, 0, 0, 5981.49, -1963.15, 237.669, 4.15088, 600, 10, 0, 0, 1),
+(79895, 28603, 571, '0', 0, 0, 0, 6017.39, -2106.46, 243.382, 5.40752, 600, 10, 0, 0, 1),
+(79899, 28603, 571, '0', 0, 0, 0, 5275.12, -1678.04, 236.349, 1.1703, 600, 10, 0, 0, 1),
+(79921, 28603, 571, '0', 0, 0, 0, 5224.69, -1751.98, 235.717, 3.17306, 600, 10, 0, 0, 1),
+(80289, 28603, 571, '0', 0, 0, 0, 5154.48, -1745.88, 238.291, 3.26731, 600, 10, 0, 0, 1),
+(80295, 28603, 571, '0', 0, 0, 0, 5082.87, -1725.64, 235.624, 3.55791, 600, 10, 0, 0, 1),
+(80299, 28603, 571, '0', 0, 0, 0, 5034.49, -1655.17, 240.16, 1.8693, 600, 10, 0, 0, 1),
+(80300, 28603, 571, '0', 0, 0, 0, 5069.11, -1540.09, 240.561, 6.1183, 600, 10, 0, 0, 1),
+(80303, 28603, 571, '0', 0, 0, 0, 5099.29, -1559.64, 238.941, 0.624444, 600, 10, 0, 0, 1),
+(80311, 28603, 571, '0', 0, 0, 0, 6183.62, -2102.73, 235.653, 3.426750, 600, 10, 0, 0, 1),
+(80312, 28603, 571, '0', 0, 0, 0, 6113.59, -2105.41, 234.909, 0.441447, 600, 10, 0, 0, 1),
+(80315, 28603, 571, '0', 0, 0, 0, 6091.98, -2019.44, 235.639, 1.670596, 600, 10, 0, 0, 1),
+(80316, 28603, 571, '0', 0, 0, 0, 6199.66, -1957.45, 234.049, 1.207211, 600, 10, 0, 0, 1),
+(80323, 28603, 571, '0', 0, 0, 0, 6242.41, -2003.27, 234.282, 4.150887, 600, 10, 0, 0, 1);
diff --git a/sql/updates/world/master/2020_06_14_13_world_2017_05_23_00_world.sql b/sql/updates/world/master/2020_06_14_13_world_2017_05_23_00_world.sql
new file mode 100644
index 00000000000..635d13558d6
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_13_world_2017_05_23_00_world.sql
@@ -0,0 +1,2 @@
+-- correct typo in account set gmlevel command help
+UPDATE `command` SET `help`="Syntax: .account set gmlevel [$account] #level [#realmID]\r\n\r\nSet the security level for targeted player (can't be used at self) or for account $name to a level of #level on the realm #realmID.\r\n\r\n#level may range from 0 to 3.\r\n\r\n#realmID may be -1 for all realms." WHERE `name`='account set gmlevel';
diff --git a/sql/updates/world/master/2020_06_14_14_world_2017_05_25_00_world.sql b/sql/updates/world/master/2020_06_14_14_world_2017_05_25_00_world.sql
new file mode 100644
index 00000000000..f8a1e0e2bfd
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_14_world_2017_05_25_00_world.sql
@@ -0,0 +1,7 @@
+UPDATE `smart_scripts` SET `link`=13 WHERE `entryorguid`=28213 AND `source_type`=0 AND `id`IN(8,10);
+UPDATE `smart_scripts` SET `event_type`=7 WHERE `entryorguid`=28213 AND `source_type`=0 AND `id`=9 AND `link`=10;
+DELETE FROM `smart_scripts` WHERE `entryorguid` =28213 AND `source_type`=0 AND `id`IN(13,14,6);
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(28213, 0, 13, 0, 61, 0, 100, 512, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hardknuckle Matriarch - On Respawn - Set Passive'),
+(28213, 0, 14, 0, 61, 0, 100, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 500, 0, 0, 0, 0, 0, 0, 'Hardknuckle Matriarch - On Data Set 1 1 - Start Attacking'),
+(28213, 0, 6, 14, 61, 0, 100, 0, 0, 0, 0, 0, 8, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Hardknuckle Matriarch - On Data Set 1 1 - Set Aggresive');
diff --git a/sql/updates/world/master/2020_06_14_15_world_2017_05_24_01_world.sql b/sql/updates/world/master/2020_06_14_15_world_2017_05_24_01_world.sql
new file mode 100644
index 00000000000..2eb3abfea9a
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_15_world_2017_05_24_01_world.sql
@@ -0,0 +1,9 @@
+--
+UPDATE `gameobject_addon` SET `invisibilityType`=9, `invisibilityValue`=1000 WHERE `guid`=270;
+UPDATE `gameobject_addon` SET `invisibilityType`=8, `invisibilityValue`=1000 WHERE `guid`=21077;
+UPDATE `gameobject_addon` SET `invisibilityType`=5, `invisibilityValue`=1000 WHERE `guid`=21079;
+DELETE FROM `spell_area` WHERE `spell` IN (56773,56772,56774) AND `area`=4438;
+INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `racemask`, `gender`, `flags`, `quest_start_status`, `quest_end_status`) VALUES
+(56773, 4438, 12987, 0, 0, 0, 2, 3, 66, 0),
+(56772, 4438, 13001, 0, 0, 0, 2, 3, 64, 0),
+(56774, 4438, 12976, 0, 0, 0, 2, 3, 64, 0);
diff --git a/sql/updates/world/master/2020_06_14_16_world_2017_05_25_01_world.sql b/sql/updates/world/master/2020_06_14_16_world_2017_05_25_01_world.sql
new file mode 100644
index 00000000000..eb91c138ca6
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_16_world_2017_05_25_01_world.sql
@@ -0,0 +1 @@
+UPDATE `spell_proc` SET `AttributesMask`=0x2 WHERE `SpellId`=64890;
diff --git a/sql/updates/world/master/2020_06_14_17_world_2017_05_28_05_world.sql b/sql/updates/world/master/2020_06_14_17_world_2017_05_28_05_world.sql
new file mode 100644
index 00000000000..0f85da3fb9e
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_17_world_2017_05_28_05_world.sql
@@ -0,0 +1,37 @@
+--
+UPDATE `creature_text` SET `BroadcastTextId`=22882 WHERE `CreatureID`=24151 AND `GroupID`=0 AND `ID`=0;
+UPDATE `creature_text` SET `BroadcastTextId`=22880 WHERE `CreatureID`=24151 AND `GroupID`=0 AND `ID`=1;
+UPDATE `creature_text` SET `BroadcastTextId`=22881 WHERE `CreatureID`=24151 AND `GroupID`=0 AND `ID`=2;
+UPDATE `creature_text` SET `BroadcastTextId`=22698 WHERE `CreatureID`=24216 AND `GroupID`=0 AND `ID`=0;
+UPDATE `creature_text` SET `BroadcastTextId`=22701 WHERE `CreatureID`=24216 AND `GroupID`=0 AND `ID`=1;
+UPDATE `creature_text` SET `BroadcastTextId`=22699 WHERE `CreatureID`=24216 AND `GroupID`=0 AND `ID`=2;
+UPDATE `creature_text` SET `BroadcastTextId`=22702 WHERE `CreatureID`=24216 AND `GroupID`=0 AND `ID`=3;
+UPDATE `creature_text` SET `BroadcastTextId`=22697 WHERE `CreatureID`=24216 AND `GroupID`=0 AND `ID`=4;
+UPDATE `creature_text` SET `BroadcastTextId`=22700 WHERE `CreatureID`=24216 AND `GroupID`=0 AND `ID`=5;
+UPDATE `creature_text` SET `BroadcastTextId`=22953 WHERE `CreatureID`=24216 AND `GroupID`=1 AND `ID`=0;
+UPDATE `creature_text` SET `BroadcastTextId`=22957 WHERE `CreatureID`=24216 AND `GroupID`=1 AND `ID`=1;
+UPDATE `creature_text` SET `BroadcastTextId`=22954 WHERE `CreatureID`=24216 AND `GroupID`=1 AND `ID`=2;
+UPDATE `creature_text` SET `BroadcastTextId`=22955 WHERE `CreatureID`=24216 AND `GroupID`=1 AND `ID`=3;
+UPDATE `creature_text` SET `BroadcastTextId`=22956 WHERE `CreatureID`=24216 AND `GroupID`=1 AND `ID`=4;
+UPDATE `creature_text` SET `BroadcastTextId`=22698 WHERE `CreatureID`=24249 AND `GroupID`=0 AND `ID`=0;
+UPDATE `creature_text` SET `BroadcastTextId`=22701 WHERE `CreatureID`=24249 AND `GroupID`=0 AND `ID`=1;
+UPDATE `creature_text` SET `BroadcastTextId`=22699 WHERE `CreatureID`=24249 AND `GroupID`=0 AND `ID`=2;
+UPDATE `creature_text` SET `BroadcastTextId`=22815 WHERE `CreatureID`=24249 AND `GroupID`=0 AND `ID`=3;
+UPDATE `creature_text` SET `BroadcastTextId`=22813 WHERE `CreatureID`=24249 AND `GroupID`=0 AND `ID`=4;
+UPDATE `creature_text` SET `BroadcastTextId`=22814 WHERE `CreatureID`=24249 AND `GroupID`=0 AND `ID`=5;
+UPDATE `creature_text` SET `BroadcastTextId`=23082 WHERE `CreatureID`=24249 AND `GroupID`=1 AND `ID`=0;
+UPDATE `creature_text` SET `BroadcastTextId`=23083 WHERE `CreatureID`=24249 AND `GroupID`=1 AND `ID`=1;
+UPDATE `creature_text` SET `BroadcastTextId`=23084 WHERE `CreatureID`=24249 AND `GroupID`=1 AND `ID`=2;
+UPDATE `creature_text` SET `BroadcastTextId`=22698 WHERE `CreatureID`=24250 AND `GroupID`=0 AND `ID`=0;
+UPDATE `creature_text` SET `BroadcastTextId`=22701 WHERE `CreatureID`=24250 AND `GroupID`=0 AND `ID`=1;
+UPDATE `creature_text` SET `BroadcastTextId`=22699 WHERE `CreatureID`=24250 AND `GroupID`=0 AND `ID`=2;
+UPDATE `creature_text` SET `BroadcastTextId`=22815 WHERE `CreatureID`=24250 AND `GroupID`=0 AND `ID`=3;
+UPDATE `creature_text` SET `BroadcastTextId`=22813 WHERE `CreatureID`=24250 AND `GroupID`=0 AND `ID`=4;
+UPDATE `creature_text` SET `BroadcastTextId`=24847 WHERE `CreatureID`=24250 AND `GroupID`=0 AND `ID`=5;
+UPDATE `creature_text` SET `BroadcastTextId`=22859 WHERE `CreatureID`=24250 AND `GroupID`=1 AND `ID`=0;
+UPDATE `creature_text` SET `BroadcastTextId`=22860 WHERE `CreatureID`=24250 AND `GroupID`=1 AND `ID`=1;
+UPDATE `creature_text` SET `BroadcastTextId`=22857 WHERE `CreatureID`=24250 AND `GroupID`=1 AND `ID`=2;
+UPDATE `creature_text` SET `BroadcastTextId`=23076 WHERE `CreatureID`=24250 AND `GroupID`=2 AND `ID`=0;
+UPDATE `creature_text` SET `BroadcastTextId`=23077 WHERE `CreatureID`=24250 AND `GroupID`=2 AND `ID`=1;
+UPDATE `creature_text` SET `BroadcastTextId`=23078 WHERE `CreatureID`=24250 AND `GroupID`=2 AND `ID`=2;
+UPDATE `creature_text` SET `BroadcastTextId`=23079 WHERE `CreatureID`=24250 AND `GroupID`=2 AND `ID`=3;
diff --git a/sql/updates/world/master/2020_06_14_18_world_2017_05_29_00_world.sql b/sql/updates/world/master/2020_06_14_18_world_2017_05_29_00_world.sql
new file mode 100644
index 00000000000..6282e1c7b69
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_18_world_2017_05_29_00_world.sql
@@ -0,0 +1,3 @@
+DELETE FROM `command` WHERE `name` = 'debug play music';
+INSERT INTO `command` (`name`,`permission`,`help`) VALUES
+('debug play music', 855, 'Syntax: .debug play music #musicId\nPlay music with #musicId.\nMusic will be played only for you. Other players will not hear this.');
diff --git a/sql/updates/world/master/2020_06_14_19_world_2017_05_28_00_world.sql b/sql/updates/world/master/2020_06_14_19_world_2017_05_28_00_world.sql
new file mode 100644
index 00000000000..964970806f3
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_19_world_2017_05_28_00_world.sql
@@ -0,0 +1,2 @@
+UPDATE `smart_scripts` SET `event_flags`=`event_flags`|0x200 WHERE `entryorguid`=28750 AND `source_type`=0 AND `id` IN(0,2,4);
+UPDATE `smart_scripts` SET `event_flags`=`event_flags`|0x200 WHERE `entryorguid`=2875000 AND `source_type`=9;
diff --git a/sql/updates/world/master/2020_06_14_20_world_2017_05_28_01_world.sql b/sql/updates/world/master/2020_06_14_20_world_2017_05_28_01_world.sql
new file mode 100644
index 00000000000..4851dcf6986
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_20_world_2017_05_28_01_world.sql
@@ -0,0 +1,4 @@
+--
+DELETE FROM `creature` WHERE `guid` IN (129652, 129656, 129651, 129655, 129644,130577,130842,130581,130590,130582,130597,130848,130847,130846,130723,130849,130739,130855,130745,130746,130742,130748,130702,130701,130853,130703,130557,130573,130558,130700,130691,130692,130693,130834,130832,130835,130697,130694,130836,130637,130641,130838,130696,130840,130603,130685,130687,130613,130688,130686,129733,129732,129774,129765,129767,129803,129783);
+DELETE FROM `creature_addon` WHERE `guid` IN (129652, 129656, 129651, 129655, 129644,130577,130842,130581,130590,130582,130597,130848,130847,130846,130723,130849,130739,130855,130745,130746,130742,130748,130702,130701,130853,130703,130557,130573,130558,130700,130691,130692,130693,130834,130832,130835,130697,130694,130836,130637,130641,130838,130696,130840,130603,130685,130687,130613,130688,130686,129733,129732,129774,129765,129767,129803,129783);
+DELETE FROM `waypoint_data` WHERE `id` IN (1296520, 1296560, 1296510, 1296550, 1296440);
diff --git a/sql/updates/world/master/2020_06_14_21_world_2017_05_28_03_world.sql b/sql/updates/world/master/2020_06_14_21_world_2017_05_28_03_world.sql
new file mode 100644
index 00000000000..a9ffb21052a
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_21_world_2017_05_28_03_world.sql
@@ -0,0 +1,2 @@
+UPDATE `conditions` SET `SourceEntry`=3 WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=10118 AND `SourceEntry`=5 AND `ConditionTypeOrReference`=17 and `ConditionValue1`=1288;
+UPDATE `conditions` SET `SourceEntry`=5 WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=10118 AND `SourceEntry`=3 AND `ConditionTypeOrReference`=17 and `ConditionValue1` IN(1360,41);
diff --git a/sql/updates/world/master/2020_06_14_22_world_2017_06_02_00_world.sql b/sql/updates/world/master/2020_06_14_22_world_2017_06_02_00_world.sql
new file mode 100644
index 00000000000..96abdae5c20
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_22_world_2017_06_02_00_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature` SET `MovementType`=1 WHERE `guid` IN (51879,51914);
diff --git a/sql/updates/world/master/2020_06_14_23_world_2017_06_02_01_world.sql b/sql/updates/world/master/2020_06_14_23_world_2017_06_02_01_world.sql
new file mode 100644
index 00000000000..fd00cce104e
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_23_world_2017_06_02_01_world.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `creature_template` SET `AIName`='NullCreatureAI' WHERE `AIName`='NullAI';
+UPDATE `creature` SET `spawndist`=5 WHERE `guid` IN (51879,51914);
diff --git a/sql/updates/world/master/2020_06_14_24_world_2017_06_02_02_world.sql b/sql/updates/world/master/2020_06_14_24_world_2017_06_02_02_world.sql
new file mode 100644
index 00000000000..1ff1d82e05c
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_24_world_2017_06_02_02_world.sql
@@ -0,0 +1,7 @@
+--
+DELETE FROM `creature` WHERE `guid` IN (80342, 80351, 80364, 80378);
+INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnDifficulties`, `PhaseId`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `VerifiedBuild`) VALUES
+(80342, 26202, 571, 0, 0, '0', 0, 0, 0, 3247.804, 3688.892, 21.705, 3.158267, 300, 7, 0, 1, 0, 1, 0, 0, 0, -1),
+(80351, 26202, 571, 0, 0, '0', 0, 0, 0, 3180.858, 3820.200, 28.555, 3.158267, 300, 7, 0, 1, 0, 1, 0, 0, 0, -1),
+(80364, 26202, 571, 0, 0, '0', 0, 0, 0, 3190.193, 3852.021, 27.972, 3.158267, 300, 7, 0, 1, 0, 1, 0, 0, 0, -1),
+(80378, 26202, 571, 0, 0, '0', 0, 0, 0, 3158.872, 3841.474, 25.945, 3.158267, 300, 7, 0, 1, 0, 1, 0, 0, 0, -1);
diff --git a/sql/updates/world/master/2020_06_14_25_world_2017_06_03_00_world.sql b/sql/updates/world/master/2020_06_14_25_world_2017_06_03_00_world.sql
new file mode 100644
index 00000000000..75b15ae7e9b
--- /dev/null
+++ b/sql/updates/world/master/2020_06_14_25_world_2017_06_03_00_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `AIName`='' WHERE `entry`=12999;