From 47e2f8c06f4e7381e7581967d5ed9c01aa2da86c Mon Sep 17 00:00:00 2001
From: Aokromes <aokromes@gmail.com>
Date: Mon, 5 Mar 2018 15:03:50 +0100
Subject: [PATCH] rename files

---
 sql/updates/world/3.3.5/2018_02_24_01_world_335.sql             | 2 --
 sql/updates/world/3.3.5/2018_02_28_00_world_335.sql             | 2 --
 sql/updates/world/3.3.5/2018_02_28_01_world_335.sql             | 2 --
 sql/updates/world/3.3.5/2018_03_01_00_world_335.sql             | 2 --
 sql/updates/world/3.3.5/2018_03_03_00_world_335.sql             | 2 --
 sql/updates/world/3.3.5/2018_03_03_02_world_335.sql             | 2 --
 ...018_03_05_00_world_from_335_was_2018_02_24_00_world_335.sql} | 2 ++
 ...2018_03_05_01_world_from_335_was_2018_02_24_01_world_335.sql | 2 ++
 .../2018_03_05_02_world_from_335_was_2018_02_24_02_world.sql}   | 0
 .../2018_03_05_03_world_from_335_was_2018_02_24_03_world.sql}   | 0
 .../2018_03_05_04_world_from_335_was_2018_02_24_04_world.sql}   | 0
 .../2018_03_05_05_world_from_335_was_2018_02_24_05_world.sql}   | 0
 ...018_03_05_06_world_from_335_was_2018_02_25_00_world_335.sql} | 2 ++
 ...2018_03_05_07_world_from_335_was_2018_02_28_00_world_335.sql | 2 ++
 ...2018_03_05_08_world_from_335_was_2018_02_28_01_world_335.sql | 2 ++
 ...018_03_05_09_world_from_335_was_2018_02_28_02_world_335.sql} | 2 ++
 ...018_03_05_10_world_from_335_was_2018_02_28_03_world_335.sql} | 2 ++
 ...018_03_05_11_world_from_335_was_2018_02_28_04_world_335.sql} | 2 ++
 ...018_03_05_12_world_from_335_was_2018_02_28_05_world_335.sql} | 2 ++
 ...018_03_05_13_world_from_335_was_2018_02_28_06_world_335.sql} | 2 ++
 ...2018_03_05_14_world_from_335_was_2018_03_01_00_world_335.sql | 2 ++
 ...2018_03_05_15_world_from_335_was_2018_03_03_00_world_335.sql | 2 ++
 ...018_03_05_16_world_from_335_was_2018_03_03_01_world_335.sql} | 2 ++
 ...2018_03_05_17_world_from_335_was_2018_03_03_02_world_335.sql | 2 ++
 ...018_03_05_18_world_from_335_was_2018_03_03_03_world_335.sql} | 2 ++
 ...018_03_05_19_world_from_335_was_2018_03_03_04_world_335.sql} | 2 ++
 ...018_03_05_20_world_from_335_was_2018_03_03_05_world_335.sql} | 2 ++
 ...018_03_05_21_world_from_335_was_2018_03_03_06_world_335.sql} | 2 ++
 ...018_03_05_22_world_from_335_was_2018_03_03_07_world_335.sql} | 2 ++
 ...018_03_05_23_world_from_335_was_2018_03_03_08_world_335.sql} | 2 ++
 ...018_03_05_24_world_from_335_was_2018_03_04_00_world_335.sql} | 2 ++
 31 files changed, 42 insertions(+), 12 deletions(-)
 delete mode 100644 sql/updates/world/3.3.5/2018_02_24_01_world_335.sql
 delete mode 100644 sql/updates/world/3.3.5/2018_02_28_00_world_335.sql
 delete mode 100644 sql/updates/world/3.3.5/2018_02_28_01_world_335.sql
 delete mode 100644 sql/updates/world/3.3.5/2018_03_01_00_world_335.sql
 delete mode 100644 sql/updates/world/3.3.5/2018_03_03_00_world_335.sql
 delete mode 100644 sql/updates/world/3.3.5/2018_03_03_02_world_335.sql
 rename sql/updates/world/{3.3.5/2018_02_24_00_world_335.sql => 4.3.4/2018_03_05_00_world_from_335_was_2018_02_24_00_world_335.sql} (99%)
 create mode 100644 sql/updates/world/4.3.4/2018_03_05_01_world_from_335_was_2018_02_24_01_world_335.sql
 rename sql/updates/world/{3.3.5/2018_02_24_02_world.sql => 4.3.4/2018_03_05_02_world_from_335_was_2018_02_24_02_world.sql} (100%)
 rename sql/updates/world/{3.3.5/2018_02_24_03_world.sql => 4.3.4/2018_03_05_03_world_from_335_was_2018_02_24_03_world.sql} (100%)
 rename sql/updates/world/{3.3.5/2018_02_24_04_world.sql => 4.3.4/2018_03_05_04_world_from_335_was_2018_02_24_04_world.sql} (100%)
 rename sql/updates/world/{3.3.5/2018_02_24_05_world.sql => 4.3.4/2018_03_05_05_world_from_335_was_2018_02_24_05_world.sql} (100%)
 rename sql/updates/world/{3.3.5/2018_02_25_00_world_335.sql => 4.3.4/2018_03_05_06_world_from_335_was_2018_02_25_00_world_335.sql} (99%)
 create mode 100644 sql/updates/world/4.3.4/2018_03_05_07_world_from_335_was_2018_02_28_00_world_335.sql
 create mode 100644 sql/updates/world/4.3.4/2018_03_05_08_world_from_335_was_2018_02_28_01_world_335.sql
 rename sql/updates/world/{3.3.5/2018_02_28_02_world_335.sql => 4.3.4/2018_03_05_09_world_from_335_was_2018_02_28_02_world_335.sql} (99%)
 rename sql/updates/world/{3.3.5/2018_02_28_03_world_335.sql => 4.3.4/2018_03_05_10_world_from_335_was_2018_02_28_03_world_335.sql} (99%)
 rename sql/updates/world/{3.3.5/2018_02_28_04_world_335.sql => 4.3.4/2018_03_05_11_world_from_335_was_2018_02_28_04_world_335.sql} (99%)
 rename sql/updates/world/{3.3.5/2018_02_28_05_world_335.sql => 4.3.4/2018_03_05_12_world_from_335_was_2018_02_28_05_world_335.sql} (99%)
 rename sql/updates/world/{3.3.5/2018_02_28_06_world_335.sql => 4.3.4/2018_03_05_13_world_from_335_was_2018_02_28_06_world_335.sql} (99%)
 create mode 100644 sql/updates/world/4.3.4/2018_03_05_14_world_from_335_was_2018_03_01_00_world_335.sql
 create mode 100644 sql/updates/world/4.3.4/2018_03_05_15_world_from_335_was_2018_03_03_00_world_335.sql
 rename sql/updates/world/{3.3.5/2018_03_03_01_world_335.sql => 4.3.4/2018_03_05_16_world_from_335_was_2018_03_03_01_world_335.sql} (98%)
 create mode 100644 sql/updates/world/4.3.4/2018_03_05_17_world_from_335_was_2018_03_03_02_world_335.sql
 rename sql/updates/world/{3.3.5/2018_03_03_03_world_335.sql => 4.3.4/2018_03_05_18_world_from_335_was_2018_03_03_03_world_335.sql} (99%)
 rename sql/updates/world/{3.3.5/2018_03_03_04_world_335.sql => 4.3.4/2018_03_05_19_world_from_335_was_2018_03_03_04_world_335.sql} (97%)
 rename sql/updates/world/{3.3.5/2018_03_03_05_world_335.sql => 4.3.4/2018_03_05_20_world_from_335_was_2018_03_03_05_world_335.sql} (99%)
 rename sql/updates/world/{3.3.5/2018_03_03_06_world_335.sql => 4.3.4/2018_03_05_21_world_from_335_was_2018_03_03_06_world_335.sql} (99%)
 rename sql/updates/world/{3.3.5/2018_03_03_07_world_335.sql => 4.3.4/2018_03_05_22_world_from_335_was_2018_03_03_07_world_335.sql} (99%)
 rename sql/updates/world/{3.3.5/2018_03_03_08_world_335.sql => 4.3.4/2018_03_05_23_world_from_335_was_2018_03_03_08_world_335.sql} (99%)
 rename sql/updates/world/{3.3.5/2018_03_04_00_world_335.sql => 4.3.4/2018_03_05_24_world_from_335_was_2018_03_04_00_world_335.sql} (99%)

diff --git a/sql/updates/world/3.3.5/2018_02_24_01_world_335.sql b/sql/updates/world/3.3.5/2018_02_24_01_world_335.sql
deleted file mode 100644
index fb853ff5a20..00000000000
--- a/sql/updates/world/3.3.5/2018_02_24_01_world_335.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Apothecary Keever's test subjects (Caged Human Male, Squirrel, Rabbit, Toad, Sheep)
-UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry` IN (5736,5739,5741,5742,5743);
diff --git a/sql/updates/world/3.3.5/2018_02_28_00_world_335.sql b/sql/updates/world/3.3.5/2018_02_28_00_world_335.sql
deleted file mode 100644
index d3c3b8e6cde..00000000000
--- a/sql/updates/world/3.3.5/2018_02_28_00_world_335.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Fix prerequisite for quests "Hallowed Scroll" & "Glyphic Scroll"
-UPDATE `quest_template_addon` SET `PrevQuestID`=364 WHERE `ID` IN (3097,3098);
diff --git a/sql/updates/world/3.3.5/2018_02_28_01_world_335.sql b/sql/updates/world/3.3.5/2018_02_28_01_world_335.sql
deleted file mode 100644
index a21f5d25181..00000000000
--- a/sql/updates/world/3.3.5/2018_02_28_01_world_335.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Fix prerequisite for quest "Rot Hide Ichor"
-UPDATE `quest_template_addon` SET `PrevQuestID`=439 WHERE `ID`=443;
diff --git a/sql/updates/world/3.3.5/2018_03_01_00_world_335.sql b/sql/updates/world/3.3.5/2018_03_01_00_world_335.sql
deleted file mode 100644
index b2e791b532b..00000000000
--- a/sql/updates/world/3.3.5/2018_03_01_00_world_335.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Hit debuff stacking (Insect Swarm & Scorpid Sting)
-UPDATE `spell_group_stack_rules` SET `stack_rule`= 3 WHERE `group_id`= 1060;
diff --git a/sql/updates/world/3.3.5/2018_03_03_00_world_335.sql b/sql/updates/world/3.3.5/2018_03_03_00_world_335.sql
deleted file mode 100644
index de1367d5105..00000000000
--- a/sql/updates/world/3.3.5/2018_03_03_00_world_335.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Mountaineer Pebblebitty
-UPDATE `conditions` SET `ConditionTypeOrReference`=14, `Comment`="Show gossip menu option only if quest 'The Horn of the Beast' is not taken" WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=1201;
diff --git a/sql/updates/world/3.3.5/2018_03_03_02_world_335.sql b/sql/updates/world/3.3.5/2018_03_03_02_world_335.sql
deleted file mode 100644
index 0662195eecc..00000000000
--- a/sql/updates/world/3.3.5/2018_03_03_02_world_335.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Fix gossip option for Spark Nilminer
-UPDATE `gossip_menu_option` SET `ActionMenuID`=2721 WHERE `MenuID`=2422;
diff --git a/sql/updates/world/3.3.5/2018_02_24_00_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_00_world_from_335_was_2018_02_24_00_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_02_24_00_world_335.sql
rename to sql/updates/world/4.3.4/2018_03_05_00_world_from_335_was_2018_02_24_00_world_335.sql
index 9d87518b782..749c45988f6 100644
--- a/sql/updates/world/3.3.5/2018_02_24_00_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_03_05_00_world_from_335_was_2018_02_24_00_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Deathguard Elite
 UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=7980;
 DELETE FROM `smart_scripts` WHERE `entryorguid`=7980 AND `source_type`=0;
@@ -33,3 +34,4 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type
 (6804,9, 0,0, 0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Stormwind City Guard - On Script - Set Orientation"),
 (6804,9, 1,0, 0,0,100,0,2000,2000,0,0,5,25,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stormwind City Guard - On Script - Play Emote 'Point'"),
 (6804,9, 2,0, 0,0,100,0,10000,10000,0,0,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stormwind City Guard - On Script - Set Orientation");
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_05_01_world_from_335_was_2018_02_24_01_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_01_world_from_335_was_2018_02_24_01_world_335.sql
new file mode 100644
index 00000000000..5a65cfbcb37
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_05_01_world_from_335_was_2018_02_24_01_world_335.sql
@@ -0,0 +1,2 @@
+-- Apothecary Keever's test subjects (Caged Human Male, Squirrel, Rabbit, Toad, Sheep)
+-- UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry` IN (5736,5739,5741,5742,5743);
diff --git a/sql/updates/world/3.3.5/2018_02_24_02_world.sql b/sql/updates/world/4.3.4/2018_03_05_02_world_from_335_was_2018_02_24_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2018_02_24_02_world.sql
rename to sql/updates/world/4.3.4/2018_03_05_02_world_from_335_was_2018_02_24_02_world.sql
diff --git a/sql/updates/world/3.3.5/2018_02_24_03_world.sql b/sql/updates/world/4.3.4/2018_03_05_03_world_from_335_was_2018_02_24_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2018_02_24_03_world.sql
rename to sql/updates/world/4.3.4/2018_03_05_03_world_from_335_was_2018_02_24_03_world.sql
diff --git a/sql/updates/world/3.3.5/2018_02_24_04_world.sql b/sql/updates/world/4.3.4/2018_03_05_04_world_from_335_was_2018_02_24_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2018_02_24_04_world.sql
rename to sql/updates/world/4.3.4/2018_03_05_04_world_from_335_was_2018_02_24_04_world.sql
diff --git a/sql/updates/world/3.3.5/2018_02_24_05_world.sql b/sql/updates/world/4.3.4/2018_03_05_05_world_from_335_was_2018_02_24_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2018_02_24_05_world.sql
rename to sql/updates/world/4.3.4/2018_03_05_05_world_from_335_was_2018_02_24_05_world.sql
diff --git a/sql/updates/world/3.3.5/2018_02_25_00_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_06_world_from_335_was_2018_02_25_00_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_02_25_00_world_335.sql
rename to sql/updates/world/4.3.4/2018_03_05_06_world_from_335_was_2018_02_25_00_world_335.sql
index 7762bbbbe8e..8e5597649b3 100644
--- a/sql/updates/world/3.3.5/2018_02_25_00_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_03_05_06_world_from_335_was_2018_02_25_00_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- 
 DELETE FROM `gameobject_overrides` WHERE `spawnId` IN (76499, 76498, 76436, 76435, 76229, 76228, 76182, 76181, 76147, 76146, 76145, 76144, 76099, 76098, 76097, 76067, 76066, 76065, 76579, 76580);
 INSERT INTO `gameobject_overrides` (`spawnId`, `faction`, `flags`) VALUES
@@ -21,3 +22,4 @@ INSERT INTO `gameobject_overrides` (`spawnId`, `faction`, `flags`) VALUES
 (76065, 0, 16),
 (76579, 0, 16),
 (76580, 0, 16);
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_05_07_world_from_335_was_2018_02_28_00_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_07_world_from_335_was_2018_02_28_00_world_335.sql
new file mode 100644
index 00000000000..781cff5226c
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_05_07_world_from_335_was_2018_02_28_00_world_335.sql
@@ -0,0 +1,2 @@
+-- Fix prerequisite for quests "Hallowed Scroll" & "Glyphic Scroll"
+-- UPDATE `quest_template_addon` SET `PrevQuestID`=364 WHERE `ID` IN (3097,3098);
diff --git a/sql/updates/world/4.3.4/2018_03_05_08_world_from_335_was_2018_02_28_01_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_08_world_from_335_was_2018_02_28_01_world_335.sql
new file mode 100644
index 00000000000..c3d16de895a
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_05_08_world_from_335_was_2018_02_28_01_world_335.sql
@@ -0,0 +1,2 @@
+-- Fix prerequisite for quest "Rot Hide Ichor"
+-- UPDATE `quest_template_addon` SET `PrevQuestID`=439 WHERE `ID`=443;
diff --git a/sql/updates/world/3.3.5/2018_02_28_02_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_09_world_from_335_was_2018_02_28_02_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_02_28_02_world_335.sql
rename to sql/updates/world/4.3.4/2018_03_05_09_world_from_335_was_2018_02_28_02_world_335.sql
index 39e6eabfc35..9ac1010ff5b 100644
--- a/sql/updates/world/3.3.5/2018_02_28_02_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_03_05_09_world_from_335_was_2018_02_28_02_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Advisor Duskingdawn --> Fix gossip text
 DELETE FROM `gossip_menu` WHERE `MenuID`=7358 AND `TextID`=8787;
 INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
@@ -7,3 +8,4 @@ DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=73
 INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
 (14,7358,8789,0,0,16,0,512,0,0,0,0,0,"","Show gossip text if player is a Blood Elf"),
 (14,7358,8787,0,0,16,0,1279,0,0,0,0,0,"","Show gossip text if player is not a Blood Elf");
+*/
diff --git a/sql/updates/world/3.3.5/2018_02_28_03_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_10_world_from_335_was_2018_02_28_03_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_02_28_03_world_335.sql
rename to sql/updates/world/4.3.4/2018_03_05_10_world_from_335_was_2018_02_28_03_world_335.sql
index 26a074ccc05..0a77bc46bbe 100644
--- a/sql/updates/world/3.3.5/2018_02_28_03_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_03_05_10_world_from_335_was_2018_02_28_03_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Gol'dir
 DELETE FROM `creature_text` WHERE `CreatureID`=2316;
 INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
@@ -13,3 +14,4 @@ DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=23
 INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
 (22,1,2316,0,0,9,0,503,0,0,0,0,0,"","SAI triggers only if player has quest 'Gol'dir' taken"),
 (22,1,2316,0,1,28,0,503,0,0,0,0,0,"","SAI triggers only if player has quest 'Gol'dir' completed");
+*/
diff --git a/sql/updates/world/3.3.5/2018_02_28_04_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_11_world_from_335_was_2018_02_28_04_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_02_28_04_world_335.sql
rename to sql/updates/world/4.3.4/2018_03_05_11_world_from_335_was_2018_02_28_04_world_335.sql
index 97c4333d2b7..9aaf0dccb80 100644
--- a/sql/updates/world/3.3.5/2018_02_28_04_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_03_05_11_world_from_335_was_2018_02_28_04_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Blacksmith's Anvil
 SET @GUID := 1508;
 DELETE FROM `gameobject` WHERE `guid`=@GUID;
@@ -23,3 +24,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (614200,9,5,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.71042,"Mathiel - On Script - Set Orientation"),
 (614200,9,6,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mathiel - On Script - Say Line 2"),
 (614200,9,7,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mathiel - On Script - Add Npc Flag Questgiver");
+*/
diff --git a/sql/updates/world/3.3.5/2018_02_28_05_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_12_world_from_335_was_2018_02_28_05_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_02_28_05_world_335.sql
rename to sql/updates/world/4.3.4/2018_03_05_12_world_from_335_was_2018_02_28_05_world_335.sql
index aa2443b0ffd..a577836fedc 100644
--- a/sql/updates/world/3.3.5/2018_02_28_05_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_03_05_12_world_from_335_was_2018_02_28_05_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Quest "The Rescue"
 -- Locked ball and chain
 UPDATE `gameobject_template` SET `AIName`="SmartGameObjectAI" WHERE `entry` IN (1721,1722);
@@ -25,3 +26,4 @@ INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Lan
 (2238,1,0,"I will only slow you down, but no pink-skinned humans will keep me from freedom!",12,1,100,15,0,0,595,0,"Tog'thar"),
 (2239,0,0,"Ah, it is good to be free of my bonds! Have you freed Tog'thar yet? The humans split us up after our capture.",12,1,100,4,0,0,592,0,"Drull"),
 (2239,1,0,"Go on ahead without me! I will make my own way to Tarren Mill.",12,1,100,5,0,0,594,0,"Drull");
+*/
diff --git a/sql/updates/world/3.3.5/2018_02_28_06_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_13_world_from_335_was_2018_02_28_06_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_02_28_06_world_335.sql
rename to sql/updates/world/4.3.4/2018_03_05_13_world_from_335_was_2018_02_28_06_world_335.sql
index 8440db65827..c27a7378e7b 100644
--- a/sql/updates/world/3.3.5/2018_02_28_06_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_03_05_13_world_from_335_was_2018_02_28_06_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Quest "Helcular's Revenge (Part 2)"
 -- Helcular's Grave
 UPDATE `gameobject_template` SET `AIName`="SmartGameObjectAI" WHERE `entry`=1767;
@@ -23,3 +24,4 @@ DELETE FROM `creature_text` WHERE `CreatureID`=2433 AND `GroupID`=1 AND `ID`=1;
 INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
 (2433,0,3,"I returned from the grave to take my revenge!",14,0,100,15,0,0,599,0,"Helcular's Remains"),
 (2433,1,1,"Die in the name of the Dark Lady, $n.",14,0,100,0,0,0,600,0,"Helcular's Remains");
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_05_14_world_from_335_was_2018_03_01_00_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_14_world_from_335_was_2018_03_01_00_world_335.sql
new file mode 100644
index 00000000000..52f3a7ea26d
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_05_14_world_from_335_was_2018_03_01_00_world_335.sql
@@ -0,0 +1,2 @@
+-- Hit debuff stacking (Insect Swarm & Scorpid Sting)
+-- UPDATE `spell_group_stack_rules` SET `stack_rule`= 3 WHERE `group_id`= 1060;
diff --git a/sql/updates/world/4.3.4/2018_03_05_15_world_from_335_was_2018_03_03_00_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_15_world_from_335_was_2018_03_03_00_world_335.sql
new file mode 100644
index 00000000000..495c53ee2eb
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_05_15_world_from_335_was_2018_03_03_00_world_335.sql
@@ -0,0 +1,2 @@
+-- Mountaineer Pebblebitty
+-- UPDATE `conditions` SET `ConditionTypeOrReference`=14, `Comment`="Show gossip menu option only if quest 'The Horn of the Beast' is not taken" WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=1201;
diff --git a/sql/updates/world/3.3.5/2018_03_03_01_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_16_world_from_335_was_2018_03_03_01_world_335.sql
similarity index 98%
rename from sql/updates/world/3.3.5/2018_03_03_01_world_335.sql
rename to sql/updates/world/4.3.4/2018_03_05_16_world_from_335_was_2018_03_03_01_world_335.sql
index 5f61dd154a2..3ef759e8201 100644
--- a/sql/updates/world/3.3.5/2018_03_03_01_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_03_05_16_world_from_335_was_2018_03_03_01_world_335.sql
@@ -1,4 +1,6 @@
+/*
 -- Sha'ni Proudtusk's Remains
 DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=160445;
 INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
 (22,1,160445,1,0,29,1,9136,200,0,1,0,0,"","SAI triggers only if Sha'ni Proudtusk is not already spawned");
+*/
diff --git a/sql/updates/world/4.3.4/2018_03_05_17_world_from_335_was_2018_03_03_02_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_17_world_from_335_was_2018_03_03_02_world_335.sql
new file mode 100644
index 00000000000..3e64be1682a
--- /dev/null
+++ b/sql/updates/world/4.3.4/2018_03_05_17_world_from_335_was_2018_03_03_02_world_335.sql
@@ -0,0 +1,2 @@
+-- Fix gossip option for Spark Nilminer
+-- UPDATE `gossip_menu_option` SET `ActionMenuID`=2721 WHERE `MenuID`=2422;
diff --git a/sql/updates/world/3.3.5/2018_03_03_03_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_18_world_from_335_was_2018_03_03_03_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_03_03_03_world_335.sql
rename to sql/updates/world/4.3.4/2018_03_05_18_world_from_335_was_2018_03_03_03_world_335.sql
index f429092b306..87f495c7e01 100644
--- a/sql/updates/world/3.3.5/2018_03_03_03_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_03_05_18_world_from_335_was_2018_03_03_03_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Jes'rimon - add Gossip Option
 DELETE FROM `gossip_menu` WHERE `MenuID`=2190;
 INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
@@ -10,3 +11,4 @@ INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionTex
 DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=2189;
 INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
 (15,2189,0,0,0,9,0,4300,0,0,0,0,0,"","Show gossip option if quest 'Bone-Bladed Weapons' is taken");
+*/
diff --git a/sql/updates/world/3.3.5/2018_03_03_04_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_19_world_from_335_was_2018_03_03_04_world_335.sql
similarity index 97%
rename from sql/updates/world/3.3.5/2018_03_03_04_world_335.sql
rename to sql/updates/world/4.3.4/2018_03_05_19_world_from_335_was_2018_03_03_04_world_335.sql
index 961b677cdac..8f5e1b57755 100644
--- a/sql/updates/world/3.3.5/2018_03_03_04_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_03_05_19_world_from_335_was_2018_03_03_04_world_335.sql
@@ -1,3 +1,5 @@
+/*
 -- Blastmaster Emi Shortfuse
 UPDATE `creature_text` SET `Text`="FIRE IN THE HOLE!", `Language`=0, `BroadcastTextId`=4137 WHERE `CreatureID`=7998 AND `GroupID`=11;
 UPDATE `creature_text` SET `BroadcastTextId`=4207 WHERE `CreatureID`=7998 AND `GroupID`=13;
+*/
diff --git a/sql/updates/world/3.3.5/2018_03_03_05_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_20_world_from_335_was_2018_03_03_05_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_03_03_05_world_335.sql
rename to sql/updates/world/4.3.4/2018_03_05_20_world_from_335_was_2018_03_03_05_world_335.sql
index 20c443ba3ad..e96a83ceb91 100644
--- a/sql/updates/world/3.3.5/2018_03_03_05_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_03_05_20_world_from_335_was_2018_03_03_05_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Laris Geardawdle - fix Gossip Texts
 DELETE FROM `gossip_menu` WHERE `MenuID`=2405 AND `TextID` IN (3099,3098,3097);
 DELETE FROM `gossip_menu` WHERE `MenuID` IN (2406,2407,2408);
@@ -27,3 +28,4 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry
 (14,2405,3099,0,0,9,0,4513,0,0,0,0,0,"","Show gossip text 3099 if quest 'A Little Slime Goes a Long Way (Part 2)' is taken"),
 (14,2405,3098,0,0,8,0,4513,0,0,0,0,0,"","Show gossip text 3098 if quest 'A Little Slime Goes a Long Way (Part 2)' is rewarded"),
 (15,2405,0,0,0,9,0,4513,0,0,0,0,0,"","Show gossip option if quest 'A Little Slime Goes a Long Way (Part 2)' is taken");
+*/
diff --git a/sql/updates/world/3.3.5/2018_03_03_06_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_21_world_from_335_was_2018_03_03_06_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_03_03_06_world_335.sql
rename to sql/updates/world/4.3.4/2018_03_05_21_world_from_335_was_2018_03_03_06_world_335.sql
index a955ad0dbab..bca7ffb59c1 100644
--- a/sql/updates/world/3.3.5/2018_03_03_06_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_03_05_21_world_from_335_was_2018_03_03_06_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Talen
 DELETE FROM `creature_text` WHERE `CreatureID`=3846;
 INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
@@ -25,3 +26,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (384600,9,12,0,0,0,100,0,20000,20000,0,0,90,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Talen - On Script - Set Flag Standstate Sit Down");
 
 UPDATE `creature_template` SET `npcflag`=2, `gossip_menu_id`=0 WHERE `entry`=3846; -- Fix NPC flag and remove gossip
+*/
diff --git a/sql/updates/world/3.3.5/2018_03_03_07_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_22_world_from_335_was_2018_03_03_07_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_03_03_07_world_335.sql
rename to sql/updates/world/4.3.4/2018_03_05_22_world_from_335_was_2018_03_03_07_world_335.sql
index fc91aef0048..3a4788028a0 100644
--- a/sql/updates/world/3.3.5/2018_03_03_07_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_03_05_22_world_from_335_was_2018_03_03_07_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Ember Worg
 UPDATE `smart_scripts` SET `event_param1`=6000, `event_param2`=13000, `event_param3`=17000, `event_param4`=24000 WHERE `entryorguid`=9690 AND `source_type`=0 AND `id`=0;
 
@@ -142,3 +143,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 -- Fix bytes2 for some creatures
 UPDATE `creature_addon` SET `bytes2`=2 WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id` IN (7038,8978));
 UPDATE `creature_template_addon` SET `bytes2`=2 WHERE `entry`=9044;
+*/
diff --git a/sql/updates/world/3.3.5/2018_03_03_08_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_23_world_from_335_was_2018_03_03_08_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_03_03_08_world_335.sql
rename to sql/updates/world/4.3.4/2018_03_05_23_world_from_335_was_2018_03_03_08_world_335.sql
index 2afedd72859..f451d8f0b7f 100644
--- a/sql/updates/world/3.3.5/2018_03_03_08_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_03_05_23_world_from_335_was_2018_03_03_08_world_335.sql
@@ -1,3 +1,4 @@
+/*
 DELETE FROM `quest_greeting` WHERE `ID` IN (5204,1776,3441,4500,1950,7777,9536,6986,4485,7825);
 INSERT INTO `quest_greeting` (`ID`, `Type`, `GreetEmoteType`, `GreetEmoteDelay`, `Greeting`, `VerifiedBuild`) VALUES
 (5204,0,0,0,"If we are to make our place in this world, then we will do so through study, and through the will to ignore our fading human instincts.",0), -- Apothecary Zinge
@@ -10,3 +11,4 @@ INSERT INTO `quest_greeting` (`ID`, `Type`, `GreetEmoteType`, `GreetEmoteDelay`,
 (7825,0,0,0,"",0), -- Oran Snakewrithe
 (6986,0,1,0,"My name is Dran Droffers, and this over here is my dummy son Malton.  If you need salvage, or are looking to sell salvage, then we're who you need to be talking to!",0), -- Dran Droffers
 (4485,0,1,0,"The days grow long, and still no end to the conflicts of these lands can be seen. It takes no spell caster to know that much. Take up a blade while you can, $c. War can come to our doors at any time, and if I'm not mistaken, you look to be one who revels in it.",0); -- Belgrom Rockmaul
+*/
diff --git a/sql/updates/world/3.3.5/2018_03_04_00_world_335.sql b/sql/updates/world/4.3.4/2018_03_05_24_world_from_335_was_2018_03_04_00_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2018_03_04_00_world_335.sql
rename to sql/updates/world/4.3.4/2018_03_05_24_world_from_335_was_2018_03_04_00_world_335.sql
index 56e77b5d1de..9e7767a3dc8 100644
--- a/sql/updates/world/3.3.5/2018_03_04_00_world_335.sql
+++ b/sql/updates/world/4.3.4/2018_03_05_24_world_from_335_was_2018_03_04_00_world_335.sql
@@ -1,3 +1,4 @@
+/*
 -- Fix availability for quest "Zamek's Distraction"
 UPDATE `quest_template_addon` SET `PrevQuestID`=0 WHERE `ID`=1191;
 DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry`=1191;
@@ -72,3 +73,4 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type
 (472001,9,0,0,0,0,100,0,0,0,0,0,54,25000,0,0,0,0,0,1,0,0,0,0,0,0,0,'Rizzle Brassbolts - On Script - Pause Waypoint'),
 (472001,9,1,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0.943443,'Rizzle Brassbolts - On Script - Set Orientation'),
 (472001,9,2,0,0,0,100,0,20000,20000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Rizzle Brassbolts - On Script - Say Line 2');
+*/