From bf103fa893714d76ebbd3d3d560fcc59fe9f2142 Mon Sep 17 00:00:00 2001
From: Killyana <morphone1@gmail.com>
Date: Thu, 24 May 2018 04:25:40 +0200
Subject: [PATCH 01/12] DB/Gameobject: Remove legion template

---
 sql/updates/world/4.3.4/2018_05_23_00_world.sql | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 sql/updates/world/4.3.4/2018_05_23_00_world.sql

diff --git a/sql/updates/world/4.3.4/2018_05_23_00_world.sql b/sql/updates/world/4.3.4/2018_05_23_00_world.sql
new file mode 100644
index 00000000000..2cc14f14bcc
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_05_23_00_world.sql
@@ -0,0 +1,2 @@
+-- Legion gob
+DELETE FROM `gameobject_template` WHERE `entry`=214611;

From 596ff24795c8b5d7d28573582138f8ff44ded8b4 Mon Sep 17 00:00:00 2001
From: Killyana <email@example.com>
Date: Thu, 24 May 2018 04:36:10 +0200
Subject: [PATCH 02/12] update file

---
 sql/updates/world/4.3.4/2018_05_23_00_world.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sql/updates/world/4.3.4/2018_05_23_00_world.sql b/sql/updates/world/4.3.4/2018_05_23_00_world.sql
index 2cc14f14bcc..1d9425f9bc2 100644
--- a/sql/updates/world/4.3.4/2018_05_23_00_world.sql
+++ b/sql/updates/world/4.3.4/2018_05_23_00_world.sql
@@ -1,2 +1,3 @@
 -- Legion gob
 DELETE FROM `gameobject_template` WHERE `entry`=214611;
+DELETE FROM `gameobject_template_addon` WHERE `entry`=214611;

From 9fc83800e4aa52cd144ebfee19d40cad6f3cb440 Mon Sep 17 00:00:00 2001
From: Killyana <email@example.com>
Date: Sat, 26 May 2018 21:38:18 +0200
Subject: [PATCH 03/12] DB: Fix some DB errors

---
 .../world/4.3.4/2018_05_26_00_world.sql       | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 sql/updates/world/4.3.4/2018_05_26_00_world.sql

diff --git a/sql/updates/world/4.3.4/2018_05_26_00_world.sql b/sql/updates/world/4.3.4/2018_05_26_00_world.sql
new file mode 100644
index 00000000000..65fd075c1e4
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_05_26_00_world.sql
@@ -0,0 +1,64 @@
+-- 
+DELETE FROM `spell_dbc` WHERE `Id` IN (43981,42636,45433,90120,92943,90059,92948,89289,92951,94991,95858,92666,95884,98192,98846,98900,99288,98899,99551,99877,99878,107352,108859,110615,110614,110035,110034,110033,110032,103179,110515,84505,84506,90244,90245,86761,89691,89685,81358,96364,85892,85891,82094,89550,94641,90404,90372,94998,88469,89762,89781,89669,98867,89848,89249,95203);
+INSERT INTO `spell_dbc` VALUES
+(43981, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Glacier Water Basin serverside spell'),
+(42636, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2202 spellid0 serverside spell'),
+(45433, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:2203 spellid0 serverside spell'),
+(90120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:3251 spellid0 serverside spell'),
+(92943, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:3251 spellid1 serverside spell'),
+(90059, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:3255 spellid0 serverside spell'),
+(92948, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:3255 spellid1 serverside spell'),
+(89289, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:3258 spellid0 serverside spell'),
+(92951, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:3258 spellid1 serverside spell'),
+(94991, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:3523 spellid1 serverside spell'),
+(95858, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:3579 spellid1 serverside spell'),
+(92666, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:3582 spellid0 serverside spell'),
+(95884, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:3582 spellid1 serverside spell'),
+(98192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:3741 spellid0 serverside spell'),
+(98846, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:3741 spellid1 serverside spell'),
+(98900, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:3749 spellid0 serverside spell'),
+(99288, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:3749 spellid1 serverside spell'),
+(98899, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:3752 spellid0 serverside spell'),
+(99551, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:3752 spellid1 serverside spell'),
+(99877, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:3764 spellid0 serverside spell'),
+(99878, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:3764 spellid1 serverside spell'),
+(107352, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:4343 spellid0 serverside spell'),
+(108859, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:4343 spellid1 serverside spell'),
+(110615, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:4343 spellid2 serverside spell'),
+(110614, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:4343 spellid3 serverside spell'),
+(110035, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:4444 spellid0 serverside spell'),
+(110034, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:4444 spellid1 serverside spell'),
+(110033, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:4444 spellid2 serverside spell'),
+(110032, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:4444 spellid3 serverside spell'),
+(103179, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:4469 spellid0 serverside spell'),
+(110515, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Spelldifficulty_dbc id:4469 spellid1 serverside spell'),
+(84505, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Teleport to Stormwind serverside spell'),
+(84506, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Teleport to Orgrimmar serverside spell'),
+(90244, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Teleport to Vashj\'ir serverside spell'),
+(90245, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Teleport to Vashj\'ir serverside spell'),
+(86761, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Serverside spell for gobjid=206195'),
+(89691, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'q25704 - Teleport to the Southsea Holdfast serverside spell'),
+(89685, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'q25704 - Teleport to Tirth\'s Haunt serverside spell'),
+(81358, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Serverside spell for gob=204422'),
+(96364, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Serverside spell for gob=208325'),
+(85892, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'q27612 - Argent Portal serverside spell'),
+(85891, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'q27612 - Argent Portal serverside spell'),
+(82094, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'gob 204819 Periscope'),
+(89550, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Quest reward speell'),
+(94641, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Quest reward speell'),
+(90404, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Quest reward speell'),
+(90372, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Quest reward speell'),
+(94998, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Quest reward speell'),
+(88469, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Quest reward speell'),
+(89762, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Quest reward speell'),
+(89781, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Quest reward speell'),
+(89669, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Quest reward speell'),
+(98867, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Quest reward speell'),
+(89848, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Quest reward speell'),
+(89249, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Quest reward speell'),
+(95203, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 0, 'Quest reward speell');
+
+DELETE FROM `gameobject_template` WHERE `entry` IN (181105,181106,181165,183510,183511,193171,193169,193170,188597,188598);
+DELETE FROM `gameobject_template_addon` WHERE `entry` IN (181105,181106,181165,183510,183511,193171,193169,193170,188597,188598);
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-143921) AND `source_type`=0;

From f146bc15e4195ab5165e4f1a546a4e762abc7c66 Mon Sep 17 00:00:00 2001
From: ZenoX92 <ZenoX92@users.noreply.github.com>
Date: Wed, 23 May 2018 19:25:17 +0200
Subject: [PATCH 04/12] DB/Quest: Get the Scoop

Closes #21956
---
 .../world/3.3.5/2018_05_23_00_world_335.sql   | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 sql/updates/world/3.3.5/2018_05_23_00_world_335.sql

diff --git a/sql/updates/world/3.3.5/2018_05_23_00_world_335.sql b/sql/updates/world/3.3.5/2018_05_23_00_world_335.sql
new file mode 100644
index 00000000000..ef31c19120a
--- /dev/null
+++ b/sql/updates/world/3.3.5/2018_05_23_00_world_335.sql
@@ -0,0 +1,41 @@
+-- Quest "Get the Scoop"
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (21211, 21212,21217);
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=231;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(15,21211,0,0,0,9,0,1950,0,0,0,0,0,"","Show gossip option if quest 'Get the Scoop' is taken"), -- Goblin Pit Crewman
+(15,21212,0,0,0,9,0,1950,0,0,0,0,0,"","Show gossip option if quest 'Get the Scoop' is taken"), -- Gnome Pit Crewman
+(15,21217,0,0,0,9,0,1950,0,0,0,0,0,"","Show gossip option if quest 'Get the Scoop' is taken"), -- Race Master Kronkrider
+(14,231,739,0,0,9,0,1950,0,0,1,0,0,"","Show gossip text 739 if quest 'Get the Scoop' is not taken");  -- "Plucky" Johnson
+
+DELETE FROM `gossip_menu` WHERE `MenuID` IN (281, 283,433);
+DELETE FROM `gossip_menu` WHERE `MenuID`=231 AND `TextID`=739;
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(281,779,0), -- Goblin Pit Crewman
+(283,781,0), -- Gnome Pit Crewman
+(433,930,0), -- Race Master Kronkrider
+(231,739,0); -- "Plucky" Johnson
+
+DELETE FROM `gossip_menu_option` WHERE `MenuID` IN (21211, 21212,21217);
+INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, `ActionMenuID`, `ActionPoiID`, `BoxCoded`, `BoxMoney`, `BoxText`, `BoxBroadcastTextID`, `VerifiedBuild`) VALUES
+(21211,0,0,"Where is Tirth's assistant?",2769,1,1,281,0,0,0,"",0,0), -- Goblin Pit Crewman
+(21212,0,0,"Where is Tirth's assistant?",2779,1,1,283,0,0,0,"",0,0), -- Gnome Pit Crewman
+(21217,0,0,"Where is Tirth's assistant?",2779,1,1,433,0,0,0,"",0,0); -- Race Master Kronkrider
+
+DELETE FROM `npc_text` WHERE `ID`=739;
+INSERT INTO `npc_text` (`ID`, `text0_0`, `text0_1`, `BroadcastTextID0`, `lang0`, `Probability0`, `em0_0`,`em0_1`,`em0_2`,`em0_3`,`em0_4`,`em0_5`) VALUES
+(739,"Don't tell Tirth I'm still here.  If he finds out I haven't left the Shimmering Flats, I'll be running his errands and cleaning his dirty laundry forever!","",2722,0,0,0,0,0,0,0,0);
+
+-- "Plucky" Johnson
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6626 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=662600 AND `source_type`=9;
+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`, `event_param5`, `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
+(6626,0,0,0,22,0,100,0,22,0,0,0,0,80,662600,0,0,0,0,0,1,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Received Emote 'Chicken' - Run Script"),
+(6626,0,1,2,22,0,100,0,7,0,0,0,0,11,9192,2,0,0,0,0,1,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Received Emote 'Beckon' - Cast \"Plucky\" Resumes Human Form"),
+(6626,0,2,3,61,0,100,0,0,0,0,0,0,82,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Received Emote 'Beckon' - Add NPC Flag Gossip"),
+(6626,0,3,0,61,0,100,0,0,0,0,0,0,69,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Received Emote 'Beckon' - Move To Invoker"),
+(6626,0,4,0,62,0,100,0,231,0,0,0,0,15,1950,0,0,0,0,0,7,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Gossip Option 0 Selected - Complete Quest 'Get the Scoop'"),
+(6626,0,5,0,23,0,100,0,9192,0,1000,1000,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Has No Aura \"Plucky\" Resumes Human Form - Set NPC Flag 0"),
+(662600,9,0,0,0,0,100,0,0,0,0,0,0,11,9192,0,0,0,0,0,1,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Script - Cast \"Plucky\" Resumes Human Form"),
+(662600,9,1,0,0,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Script - Set Orientation"),
+(662600,9,2,0,0,0,100,0,500,500,0,0,0,5,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Script - Play Emote 'Wave'"),
+(662600,9,3,0,0,0,100,0,3500,3500,0,0,0,28,9192,0,0,0,0,0,1,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Script - Remove Aura \"Plucky\" Resumes Human Form");

From b82d234fdd581b48d58b6b4b2b05c28bd7f43986 Mon Sep 17 00:00:00 2001
From: Aokromes <Aokromes@users.noreply.github.com>
Date: Thu, 24 May 2018 23:00:02 +0200
Subject: [PATCH 05/12] Core/DBLayer: Escape even more keywords

---
 src/server/game/Battlegrounds/ArenaTeamMgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/game/Battlegrounds/ArenaTeamMgr.cpp b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp
index 785874c6edd..f99ca500892 100644
--- a/src/server/game/Battlegrounds/ArenaTeamMgr.cpp
+++ b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp
@@ -104,7 +104,7 @@ void ArenaTeamMgr::LoadArenaTeams()
     //                                                        0        1         2         3          4              5            6            7           8
     QueryResult result = CharacterDatabase.Query("SELECT arenaTeamId, name, captainGuid, type, backgroundColor, emblemStyle, emblemColor, borderStyle, borderColor, "
     //      9        10        11         12           13       14
-        "rating, weekGames, weekWins, seasonGames, seasonWins, rank FROM arena_team ORDER BY arenaTeamId ASC");
+        "rating, weekGames, weekWins, seasonGames, seasonWins, `rank` FROM arena_team ORDER BY arenaTeamId ASC");
 
     if (!result)
     {

From a4ad5205ccd211a44d057e0b40ccc2309a2daba7 Mon Sep 17 00:00:00 2001
From: Aokromes <aokromes@gmail.com>
Date: Sun, 27 May 2018 02:54:20 +0200
Subject: [PATCH 06/12] Core/DBLayer: Escape even more keywords

---
 src/server/game/Spells/SpellMgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 4b6372acc3d..1a529a9c5b4 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -861,7 +861,7 @@ void SpellMgr::LoadSpellRanks()
     uint32 oldMSTime = getMSTime();
 
     //                                                     0             1      2
-    QueryResult result = WorldDatabase.Query("SELECT first_spell_id, spell_id, `rank` from spell_ranks ORDER BY first_spell_id, rank");
+    QueryResult result = WorldDatabase.Query("SELECT first_spell_id, spell_id, `rank` from spell_ranks ORDER BY first_spell_id, `rank`");
 
     if (!result)
     {

From fa6f91105f5cc705d490ab21dd9efa06c9bfe22c Mon Sep 17 00:00:00 2001
From: Gooyeth <566327+Gooyeth@users.noreply.github.com>
Date: Sat, 26 May 2018 08:41:12 -0600
Subject: [PATCH 07/12] Core/Battleground: Fixed a problem that did not let
 Arenas queue if it was in queue of Random Battleground (#21963)

---
 src/server/game/Groups/Group.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp
index 02db1cd37e5..5d27b620dc6 100644
--- a/src/server/game/Groups/Group.cpp
+++ b/src/server/game/Groups/Group.cpp
@@ -2045,7 +2045,7 @@ GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(Battleground const*
         if (member->InBattlegroundQueueForBattlegroundQueueType(bgQueueTypeId))
             return ERR_BATTLEGROUND_JOIN_FAILED;            // not blizz-like
         // don't let join if someone from the group is in bg queue random
-        if (member->InBattlegroundQueueForBattlegroundQueueType(bgQueueTypeIdRandom))
+        if (bgOrTemplate->GetTypeID() != BATTLEGROUND_AA && member->InBattlegroundQueueForBattlegroundQueueType(bgQueueTypeIdRandom))
             return ERR_IN_RANDOM_BG;
         // don't let join to bg queue random if someone from the group is already in bg queue
         if (bgOrTemplate->GetTypeID() == BATTLEGROUND_RB && member->InBattlegroundQueue())

From c5c3a24b3bbafce8756ec9f9af2eccbcad6c9b7a Mon Sep 17 00:00:00 2001
From: ZenoX92 <ZenoX92@users.noreply.github.com>
Date: Sat, 26 May 2018 22:10:09 +0200
Subject: [PATCH 08/12] DB/Creature: Princess

Closes #21961
---
 .../world/3.3.5/2018_05_26_00_world_335.sql   | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 sql/updates/world/3.3.5/2018_05_26_00_world_335.sql

diff --git a/sql/updates/world/3.3.5/2018_05_26_00_world_335.sql b/sql/updates/world/3.3.5/2018_05_26_00_world_335.sql
new file mode 100644
index 00000000000..e66020ff15e
--- /dev/null
+++ b/sql/updates/world/3.3.5/2018_05_26_00_world_335.sql
@@ -0,0 +1,26 @@
+-- Pathing for Princess
+UPDATE `creature` SET `position_x`=-9785.24, `position_y`=-880.61, `position_z`=39.6131, `MovementType`=2 WHERE `guid`=80849;
+UPDATE `creature` SET `position_x`=-9785.44, `position_y`=-883.454, `position_z`=39.6473 WHERE `guid`=80850;
+UPDATE `creature` SET `position_x`=-9781.22, `position_y`=-881.556, `position_z`=39.5677 WHERE `guid`=80848;
+
+DELETE FROM `creature_addon` WHERE `guid`=80849;
+INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(80849,808490,0,0,0,0,"");
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=80849;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES
+(80849,80849,0,0,515,0,0),
+(80849,80850,3,240,515,0,0),
+(80849,80848,3,60,515,0,0);
+
+DELETE FROM `waypoint_data` WHERE `id`=808490;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(808490,1,-9785.24,-880.61,39.6131,0,0,0,0,100,0),
+(808490,2,-9792.77,-872.876,39.5751,0,0,0,0,100,0),
+(808490,3,-9793.2,-867.623,39.4678,0,0,0,0,100,0),
+(808490,4,-9774.36,-847.313,39.7919,0,0,0,0,100,0),
+(808490,5,-9767.83,-847.814,39.6107,0,0,0,0,100,0),
+(808490,6,-9752.2,-863.369,39.4772,0,0,0,0,100,0),
+(808490,7,-9753.51,-871.917,39.5511,0,0,0,0,100,0),
+(808490,8,-9769.58,-886.229,39.4867,0,0,0,0,100,0),
+(808490,9,-9776.63,-887.336,39.5384,0,0,0,0,100,0);

From 836623ac31f578c019b6f2146d7c90d875ebe4e9 Mon Sep 17 00:00:00 2001
From: ZenoX92 <ZenoX92@users.noreply.github.com>
Date: Sat, 26 May 2018 22:10:47 +0200
Subject: [PATCH 09/12] DB/Quest: The Missing Diplomat (Part 8)

Closes #21964
---
 .../world/3.3.5/2018_05_26_01_world_335.sql   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 sql/updates/world/3.3.5/2018_05_26_01_world_335.sql

diff --git a/sql/updates/world/3.3.5/2018_05_26_01_world_335.sql b/sql/updates/world/3.3.5/2018_05_26_01_world_335.sql
new file mode 100644
index 00000000000..20b5ee6ef38
--- /dev/null
+++ b/sql/updates/world/3.3.5/2018_05_26_01_world_335.sql
@@ -0,0 +1,31 @@
+-- Old Town Thug
+DELETE FROM `creature_text` WHERE `CreatureID` IN (4969,38867);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(4969,0,0,"Yeah, okay, boss. No problem.",12,0,100,0,0,0,1715,0,"Old Town Thug"),
+(38867,0,0,"All right, boss. You sure though? Just seems like a waste of good practice.",12,0,100,0,0,0,1716,0,"Old Town Thug"),
+(38867,1,0,"%s cracks his knuckles.",16,0,100,0,0,0,1717,0,"Old Town Thug");
+
+UPDATE `smart_scripts` SET `event_param1`=18000, `event_param2`=18000 WHERE `entryorguid`=496900 AND `source_type`=9 AND `id`=2;
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=38867;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=38867 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`, `event_param5`, `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
+(38867,0,0,1,54,0,100,0,0,0,0,0,0,42,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Old Town Thug - Just Summoned - Set Invinciblity"),
+(38867,0,1,0,61,0,100,0,0,0,0,0,0,49,0,0,0,0,0,0,21,30,0,0,0,0,0,0,"Old Town Thug - Just Summoned - Start Attacking"),
+(38867,0,2,0,38,0,100,1,1,1,0,0,0,80,496900,2,0,0,0,0,1,0,0,0,0,0,0,0,"Old Town Thug - On Data Set - Run Script");
+
+-- Dashel Stonefist
+UPDATE `smart_scripts` SET `action_param1`=38867 WHERE `entryorguid`=496100 AND `source_type`=9 AND `id`=4;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=496101 AND `source_type`=9;
+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`, `event_param5`, `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
+(496101,9,0,0,0,0,100,0,0,0,0,0,0,15,1447,0,0,0,0,0,7,0,0,0,0,0,0,0,"Dashel Stonefist - On Script - Quest Credit 'The Missing Diplomat'"),
+(496101,9,1,0,0,0,100,0,0,0,0,0,0,45,1,1,0,0,0,0,11,4969,30,0,0,0,0,0,"Dashel Stonefist - On Script - Set Data to Old Town Thug"),
+(496101,9,2,0,0,0,100,0,0,0,0,0,0,45,1,1,0,0,0,0,11,38867,30,0,0,0,0,0,"Dashel Stonefist - On Script - Set Data to Old Town Thug"),
+(496101,9,3,0,0,0,100,0,0,0,0,0,0,24,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dashel Stonefist - On Script - Evade"),
+(496101,9,4,0,0,0,100,0,0,0,0,0,0,2,84,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dashel Stonefist - On Script - Set Faction 84"),
+(496101,9,5,0,0,0,100,0,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dashel Stonefist - On Script - Say Line 1"),
+(496101,9,6,0,0,0,100,0,6000,6000,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dashel Stonefist - On Script - Say Line 2"),
+(496101,9,7,0,0,0,100,0,0,0,0,0,0,42,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dashel Stonefist - On Script - Set Invincibility Off"),
+(496101,9,8,0,0,0,100,0,4000,4000,0,0,0,1,0,0,0,0,0,0,19,4969,0,0,0,0,0,0,"Dashel Stonefist - On Script - Say Line 0 (Old Town Thug)"),
+(496101,9,9,0,0,0,100,0,3000,3000,0,0,0,1,0,0,0,0,0,0,19,38867,0,0,0,0,0,0,"Dashel Stonefist - On Script - Say Line 0 (Old Town Thug)"),
+(496101,9,10,0,0,0,100,0,0,0,0,0,0,1,1,0,0,0,0,0,19,38867,0,0,0,0,0,0,"Dashel Stonefist - On Script - Say Line 1 (Old Town Thug)");

From 3a9d239544c369af46839147b2bb3876911ac559 Mon Sep 17 00:00:00 2001
From: ZenoX92 <ZenoX92@users.noreply.github.com>
Date: Sat, 26 May 2018 22:11:21 +0200
Subject: [PATCH 10/12] DB/Quest: In Search of Knowledge

Closes #21965
---
 .../world/3.3.5/2018_05_26_02_world_335.sql       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 sql/updates/world/3.3.5/2018_05_26_02_world_335.sql

diff --git a/sql/updates/world/3.3.5/2018_05_26_02_world_335.sql b/sql/updates/world/3.3.5/2018_05_26_02_world_335.sql
new file mode 100644
index 00000000000..d175fdb9ffe
--- /dev/null
+++ b/sql/updates/world/3.3.5/2018_05_26_02_world_335.sql
@@ -0,0 +1,15 @@
+-- Daryn Lightwind
+DELETE FROM `creature_text` WHERE `CreatureID`=7907;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(7907,0,0,"Take a look around, $n. Perhaps you will find something that I have missed.",12,0,100,0,0,0,4042,0,"Daryn Lightwind"),
+(7907,1,0,"%s gestures at the piles of books.",16,0,100,25,0,0,4043,0,"Daryn Lightwind");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=7907;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=7907 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=790700 AND `source_type`=9;
+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
+(7907,0,0,0,20,0,100,0,2939,0,0,0,80,790700,0,0,0,0,0,1,0,0,0,0,0,0,0,"Daryn Lightwind - On Quest 'In Search of Knowledge' Finished - Run Script"),
+(790700,9,0,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0.127147,"Daryn Lightwind - On Script - Set Orientation"),
+(790700,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Daryn Lightwind - On Script - Say Line 0"),
+(790700,9,2,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Daryn Lightwind - On Script - Say Line 1"),
+(790700,9,3,0,0,0,100,0,10000,10000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,3.82227,"Daryn Lightwind - On Script - Set Orientation");

From 24f63402dcef4192beb7b3ec8705675486bd0422 Mon Sep 17 00:00:00 2001
From: ZenoX92 <ZenoX92@users.noreply.github.com>
Date: Sat, 26 May 2018 22:11:52 +0200
Subject: [PATCH 11/12] DB/Quest: Return to Troyas

Closes #21966
---
 .../world/3.3.5/2018_05_26_03_world_335.sql     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 sql/updates/world/3.3.5/2018_05_26_03_world_335.sql

diff --git a/sql/updates/world/3.3.5/2018_05_26_03_world_335.sql b/sql/updates/world/3.3.5/2018_05_26_03_world_335.sql
new file mode 100644
index 00000000000..a07d156b61e
--- /dev/null
+++ b/sql/updates/world/3.3.5/2018_05_26_03_world_335.sql
@@ -0,0 +1,17 @@
+-- Troyas Moonbreeze
+DELETE FROM `creature_text` WHERE `CreatureID`=7764;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(7764,0,0,"Feralas: A History... Hmmmm... Let me examine this for a moment.",12,0,100,0,0,0,4039,0,"Troyas Moonbreeze"),
+(7764,1,0,"%s skims the pages of the book.",16,0,100,0,0,0,4040,0,"Troyas Moonbreeze"),
+(7764,2,0,"Amazing! I think I have found it, $n!",12,0,100,5,0,0,4041,0,"Troyas Moonbreeze");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=7764;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=7764 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=776400 AND `source_type`=9;
+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
+(7764,0,0,0,20,0,100,0,2943,0,0,0,80,776400,0,0,0,0,0,1,0,0,0,0,0,0,0,"Troyas Moonbreeze - On Quest 'Return to Troyas' Finished - Run Script"),
+(776400,9,0,0,0,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Troyas Moonbreeze - On Script - Remove Npc Flag Questgiver"),
+(776400,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Troyas Moonbreeze - On Script - Say Line 0"),
+(776400,9,2,0,0,0,100,0,3000,3000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Troyas Moonbreeze - On Script - Say Line 1"),
+(776400,9,3,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Troyas Moonbreeze - On Script - Say Line 2"),
+(776400,9,4,0,0,0,100,0,2000,2000,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Troyas Moonbreeze - On Script - Add Npc Flag Questgiver");

From a725b58a1dd23bb96be7d1a1bdded9b8bdfe66bf Mon Sep 17 00:00:00 2001
From: Aokromes <aokromes@gmail.com>
Date: Sun, 27 May 2018 02:57:58 +0200
Subject: [PATCH 12/12] rename files

---
 ...018_05_27_00_world_from_335_was_2018_05_23_00_world_335.sql} | 2 ++
 ...018_05_27_01_world_from_335_was_2018_05_26_00_world_335.sql} | 2 ++
 ...018_05_27_02_world_from_335_was_2018_05_26_01_world_335.sql} | 2 ++
 ...018_05_27_03_world_from_335_was_2018_05_26_02_world_335.sql} | 2 ++
 ...018_05_27_04_world_from_335_was_2018_05_26_03_world_335.sql} | 2 ++
 5 files changed, 10 insertions(+)
 rename sql/updates/world/{3.3.5/2018_05_23_00_world_335.sql => 4.3.4/2018_05_27_00_world_from_335_was_2018_05_23_00_world_335.sql} (99%)
 rename sql/updates/world/{3.3.5/2018_05_26_00_world_335.sql => 4.3.4/2018_05_27_01_world_from_335_was_2018_05_26_00_world_335.sql} (99%)
 rename sql/updates/world/{3.3.5/2018_05_26_01_world_335.sql => 4.3.4/2018_05_27_02_world_from_335_was_2018_05_26_01_world_335.sql} (99%)
 rename sql/updates/world/{3.3.5/2018_05_26_02_world_335.sql => 4.3.4/2018_05_27_03_world_from_335_was_2018_05_26_02_world_335.sql} (99%)
 rename sql/updates/world/{3.3.5/2018_05_26_03_world_335.sql => 4.3.4/2018_05_27_04_world_from_335_was_2018_05_26_03_world_335.sql} (99%)

diff --git a/sql/updates/world/3.3.5/2018_05_23_00_world_335.sql b/sql/updates/world/4.3.4/2018_05_27_00_world_from_335_was_2018_05_23_00_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_05_23_00_world_335.sql
rename to sql/updates/world/4.3.4/2018_05_27_00_world_from_335_was_2018_05_23_00_world_335.sql
index ef31c19120a..7cf73f9e0a4 100644
--- a/sql/updates/world/3.3.5/2018_05_23_00_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_05_27_00_world_from_335_was_2018_05_23_00_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Quest "Get the Scoop"
 DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (21211, 21212,21217);
 DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=231;
@@ -39,3 +40,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (662600,9,1,0,0,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Script - Set Orientation"),
 (662600,9,2,0,0,0,100,0,500,500,0,0,0,5,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Script - Play Emote 'Wave'"),
 (662600,9,3,0,0,0,100,0,3500,3500,0,0,0,28,9192,0,0,0,0,0,1,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Script - Remove Aura \"Plucky\" Resumes Human Form");
+*/
diff --git a/sql/updates/world/3.3.5/2018_05_26_00_world_335.sql b/sql/updates/world/4.3.4/2018_05_27_01_world_from_335_was_2018_05_26_00_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_05_26_00_world_335.sql
rename to sql/updates/world/4.3.4/2018_05_27_01_world_from_335_was_2018_05_26_00_world_335.sql
index e66020ff15e..dfee02842fa 100644
--- a/sql/updates/world/3.3.5/2018_05_26_00_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_05_27_01_world_from_335_was_2018_05_26_00_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Pathing for Princess
 UPDATE `creature` SET `position_x`=-9785.24, `position_y`=-880.61, `position_z`=39.6131, `MovementType`=2 WHERE `guid`=80849;
 UPDATE `creature` SET `position_x`=-9785.44, `position_y`=-883.454, `position_z`=39.6473 WHERE `guid`=80850;
@@ -24,3 +25,4 @@ INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `positio
 (808490,7,-9753.51,-871.917,39.5511,0,0,0,0,100,0),
 (808490,8,-9769.58,-886.229,39.4867,0,0,0,0,100,0),
 (808490,9,-9776.63,-887.336,39.5384,0,0,0,0,100,0);
+*/
diff --git a/sql/updates/world/3.3.5/2018_05_26_01_world_335.sql b/sql/updates/world/4.3.4/2018_05_27_02_world_from_335_was_2018_05_26_01_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_05_26_01_world_335.sql
rename to sql/updates/world/4.3.4/2018_05_27_02_world_from_335_was_2018_05_26_01_world_335.sql
index 20b5ee6ef38..f6e131018be 100644
--- a/sql/updates/world/3.3.5/2018_05_26_01_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_05_27_02_world_from_335_was_2018_05_26_01_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Old Town Thug
 DELETE FROM `creature_text` WHERE `CreatureID` IN (4969,38867);
 INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
@@ -29,3 +30,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (496101,9,8,0,0,0,100,0,4000,4000,0,0,0,1,0,0,0,0,0,0,19,4969,0,0,0,0,0,0,"Dashel Stonefist - On Script - Say Line 0 (Old Town Thug)"),
 (496101,9,9,0,0,0,100,0,3000,3000,0,0,0,1,0,0,0,0,0,0,19,38867,0,0,0,0,0,0,"Dashel Stonefist - On Script - Say Line 0 (Old Town Thug)"),
 (496101,9,10,0,0,0,100,0,0,0,0,0,0,1,1,0,0,0,0,0,19,38867,0,0,0,0,0,0,"Dashel Stonefist - On Script - Say Line 1 (Old Town Thug)");
+*/
diff --git a/sql/updates/world/3.3.5/2018_05_26_02_world_335.sql b/sql/updates/world/4.3.4/2018_05_27_03_world_from_335_was_2018_05_26_02_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_05_26_02_world_335.sql
rename to sql/updates/world/4.3.4/2018_05_27_03_world_from_335_was_2018_05_26_02_world_335.sql
index d175fdb9ffe..462f4d0309e 100644
--- a/sql/updates/world/3.3.5/2018_05_26_02_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_05_27_03_world_from_335_was_2018_05_26_02_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Daryn Lightwind
 DELETE FROM `creature_text` WHERE `CreatureID`=7907;
 INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
@@ -13,3 +14,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (790700,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Daryn Lightwind - On Script - Say Line 0"),
 (790700,9,2,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Daryn Lightwind - On Script - Say Line 1"),
 (790700,9,3,0,0,0,100,0,10000,10000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,3.82227,"Daryn Lightwind - On Script - Set Orientation");
+*/
diff --git a/sql/updates/world/3.3.5/2018_05_26_03_world_335.sql b/sql/updates/world/4.3.4/2018_05_27_04_world_from_335_was_2018_05_26_03_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_05_26_03_world_335.sql
rename to sql/updates/world/4.3.4/2018_05_27_04_world_from_335_was_2018_05_26_03_world_335.sql
index a07d156b61e..e0a986ed8f6 100644
--- a/sql/updates/world/3.3.5/2018_05_26_03_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_05_27_04_world_from_335_was_2018_05_26_03_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Troyas Moonbreeze
 DELETE FROM `creature_text` WHERE `CreatureID`=7764;
 INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
@@ -15,3 +16,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (776400,9,2,0,0,0,100,0,3000,3000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Troyas Moonbreeze - On Script - Say Line 1"),
 (776400,9,3,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Troyas Moonbreeze - On Script - Say Line 2"),
 (776400,9,4,0,0,0,100,0,2000,2000,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Troyas Moonbreeze - On Script - Add Npc Flag Questgiver");
+*/