From c36efa65c36e993c4900b467e79a192fe0576055 Mon Sep 17 00:00:00 2001
From: Aokromes <aokromes@gmail.com>
Date: Wed, 2 Nov 2016 04:34:13 +0100
Subject: [PATCH] DB/Misc: Rename files

---
 sql/base/characters_database.sql              |  2 +-
 ...from_335_was_2016_10_30_00_characters.sql} |  0
 .../world/3.3.5/2016_10_30_05_world_335.sql   |  2 -
 .../world/3.3.5/2016_10_30_06_world_335.sql   | 76 ------------------
 ...orld_from_335_was_2016_10_25_00_world.sql} |  0
 ...orld_from_335_was_2016_10_26_00_world.sql} |  0
 ...orld_from_335_was_2016_10_26_01_world.sql} |  0
 ...orld_from_335_was_2016_10_26_02_world.sql} |  0
 ..._from_335_was_2016_10_27_00_world_335.sql} |  2 +
 ...orld_from_335_was_2016_10_27_03_world.sql} |  0
 ...orld_from_335_was_2016_10_27_04_world.sql} |  0
 ...orld_from_335_was_2016_10_27_05_world.sql} |  0
 ...orld_from_335_was_2016_10_27_06_world.sql} |  0
 ...orld_from_335_was_2016_10_28_00_world.sql} |  0
 ...orld_from_335_was_2016_10_28_01_world.sql} |  0
 ...orld_from_335_was_2016_10_29_00_world.sql} |  0
 ..._from_335_was_2016_10_29_01_world_335.sql} |  2 +
 ...orld_from_335_was_2016_10_29_02_world.sql} |  0
 ...orld_from_335_was_2016_10_29_03_world.sql} |  0
 ...orld_from_335_was_2016_10_29_04_world.sql} |  0
 ...orld_from_335_was_2016_10_29_05_world.sql} |  0
 ...orld_from_335_was_2016_10_29_06_world.sql} |  0
 ...orld_from_335_was_2016_10_29_07_world.sql} |  0
 ...orld_from_335_was_2016_10_30_00_world.sql} |  0
 ...orld_from_335_was_2016_10_30_02_world.sql} |  0
 ...orld_from_335_was_2016_10_30_03_world.sql} |  0
 ...orld_from_335_was_2016_10_30_04_world.sql} |  0
 ...d_from_335_was_2016_10_30_05_world_335.sql |  2 +
 ...d_from_335_was_2016_10_30_06_world_335.sql | 78 +++++++++++++++++++
 ..._from_335_was_2016_10_30_07_world_335.sql} |  2 +
 ...orld_from_335_was_2016_10_30_08_world.sql} |  0
 ...orld_from_335_was_2016_10_31_00_world.sql} |  0
 ...orld_from_335_was_2016_11_01_00_world.sql} |  0
 ...orld_from_335_was_2016_11_01_01_world.sql} |  0
 ...orld_from_335_was_2016_11_01_02_world.sql} |  0
 ...orld_from_335_was_2016_11_01_03_world.sql} |  0
 ..._from_335_was_2016_11_01_04_world_335.sql} |  2 +
 ..._from_335_was_2016_11_02_00_world_335.sql} |  2 +
 38 files changed, 91 insertions(+), 79 deletions(-)
 rename sql/updates/characters/{3.3.5/2016_10_30_00_characters.sql => 4.3.4/2016_11_02_00_characters_from_335_was_2016_10_30_00_characters.sql} (100%)
 delete mode 100644 sql/updates/world/3.3.5/2016_10_30_05_world_335.sql
 delete mode 100644 sql/updates/world/3.3.5/2016_10_30_06_world_335.sql
 rename sql/updates/world/3.3.5/{2016_10_25_00_world.sql => 2016_11_02_00_world_from_335_was_2016_10_25_00_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_26_00_world.sql => 2016_11_02_01_world_from_335_was_2016_10_26_00_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_26_01_world.sql => 2016_11_02_02_world_from_335_was_2016_10_26_01_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_26_02_world.sql => 2016_11_02_03_world_from_335_was_2016_10_26_02_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_27_00_world_335.sql => 2016_11_02_04_world_from_335_was_2016_10_27_00_world_335.sql} (99%)
 rename sql/updates/world/3.3.5/{2016_10_27_03_world.sql => 2016_11_02_05_world_from_335_was_2016_10_27_03_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_27_04_world.sql => 2016_11_02_06_world_from_335_was_2016_10_27_04_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_27_05_world.sql => 2016_11_02_07_world_from_335_was_2016_10_27_05_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_27_06_world.sql => 2016_11_02_08_world_from_335_was_2016_10_27_06_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_28_00_world.sql => 2016_11_02_09_world_from_335_was_2016_10_28_00_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_28_01_world.sql => 2016_11_02_10_world_from_335_was_2016_10_28_01_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_29_00_world.sql => 2016_11_02_11_world_from_335_was_2016_10_29_00_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_29_01_world_335.sql => 2016_11_02_12_world_from_335_was_2016_10_29_01_world_335.sql} (99%)
 rename sql/updates/world/3.3.5/{2016_10_29_02_world.sql => 2016_11_02_13_world_from_335_was_2016_10_29_02_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_29_03_world.sql => 2016_11_02_14_world_from_335_was_2016_10_29_03_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_29_04_world.sql => 2016_11_02_15_world_from_335_was_2016_10_29_04_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_29_05_world.sql => 2016_11_02_16_world_from_335_was_2016_10_29_05_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_29_06_world.sql => 2016_11_02_17_world_from_335_was_2016_10_29_06_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_29_07_world.sql => 2016_11_02_18_world_from_335_was_2016_10_29_07_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_30_00_world.sql => 2016_11_02_19_world_from_335_was_2016_10_30_00_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_30_02_world.sql => 2016_11_02_20_world_from_335_was_2016_10_30_02_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_30_03_world.sql => 2016_11_02_21_world_from_335_was_2016_10_30_03_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_30_04_world.sql => 2016_11_02_22_world_from_335_was_2016_10_30_04_world.sql} (100%)
 create mode 100644 sql/updates/world/3.3.5/2016_11_02_23_world_from_335_was_2016_10_30_05_world_335.sql
 create mode 100644 sql/updates/world/3.3.5/2016_11_02_24_world_from_335_was_2016_10_30_06_world_335.sql
 rename sql/updates/world/3.3.5/{2016_10_30_07_world_335.sql => 2016_11_02_25_world_from_335_was_2016_10_30_07_world_335.sql} (99%)
 rename sql/updates/world/3.3.5/{2016_10_30_08_world.sql => 2016_11_02_26_world_from_335_was_2016_10_30_08_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_10_31_00_world.sql => 2016_11_02_27_world_from_335_was_2016_10_31_00_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_11_01_00_world.sql => 2016_11_02_28_world_from_335_was_2016_11_01_00_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_11_01_01_world.sql => 2016_11_02_29_world_from_335_was_2016_11_01_01_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_11_01_02_world.sql => 2016_11_02_30_world_from_335_was_2016_11_01_02_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_11_01_03_world.sql => 2016_11_02_31_world_from_335_was_2016_11_01_03_world.sql} (100%)
 rename sql/updates/world/3.3.5/{2016_11_01_04_world_335.sql => 2016_11_02_32_world_from_335_was_2016_11_01_04_world_335.sql} (99%)
 rename sql/updates/world/3.3.5/{2016_11_02_00_world_335.sql => 2016_11_02_33_world_from_335_was_2016_11_02_00_world_335.sql} (99%)

diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index f55d1d9146b..579599d6f94 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -2814,7 +2814,7 @@ CREATE TABLE `updates` (
 
 LOCK TABLES `updates` WRITE;
 /*!40000 ALTER TABLE `updates` DISABLE KEYS */;
-INSERT INTO `updates` VALUES ('2014_10_28_00_characters.sql','DCC0367E2784919FBE6ED44D60057179','ARCHIVED','2014-10-28 21:00:00',0),('2015_03_20_00_characters.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_01_characters.sql','894F08B70449A5481FFAF394EE5571D7FC4D8A3A','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_02_characters.sql','97D7BE0CAADC79F3F11B9FD296B8C6CD40FE593B','ARCHIVED','2015-03-21 21:44:51',0),('2015_06_26_00_characters_335.sql','f8230a59a9e878a6f54f421d6621f1595bd93861','ARCHIVED','2015-03-21 21:44:51',0),('2016_01_11_00_characters_from_335.sql','AAECE4BA6FDCF0C34A57FADD11DB68DAFD8AE9CD','ARCHIVED','2016-01-10 21:57:56',0),('2016_01_11_01_characters_from_335.sql','F8682A431D50E54BDC4AC0E7DBED21AE8AAB6AD4','ARCHIVED','2015-09-29 22:23:32',0),('2016_01_11_02_characters_from_335.sql','4555A7F35C107E54C13D74D20F141039ED42943E','ARCHIVED','2015-10-29 20:32:37',0),('2016_01_14_from_335_2015_10_06_00_characters.sql','16842FDD7E8547F2260D3312F53EFF8761EFAB35','ARCHIVED','2015-10-11 19:47:41',0),('2016_01_14_from_335_2015_10_07_00_characters.sql','E15AB463CEBE321001D7BFDEA4B662FF618728FD','ARCHIVED','2015-10-11 19:47:41',0),('2016_01_14_from_335_2015_10_12_00_characters.sql','D6F9927BDED72AD0A81D6EC2C6500CBC34A39FA2','ARCHIVED','2015-10-13 01:06:25',0),('2016_01_14_from_335_2015_10_28_00_characters.sql','622A9CA8FCE690429EBE23BA071A37C7A007BF8B','ARCHIVED','2015-10-28 21:49:52',0),('2016_01_14_from_335_2015_11_03_00_characters.sql','CC045717B8FDD9733351E52A5302560CD08AAD57','ARCHIVED','2015-11-03 22:56:17',0),('2016_02_21_from_335_2016_02_10_00_characters.sql','F1B4DA202819CABC7319A4470A2D224A34609E97','RELEASED','2016-02-10 00:00:00',0),('2016_03_12_00_characters.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','RELEASED','2016-03-12 00:00:00',0), ('2016_07_17_00_characters.sql', '41BF94C59FE13A61067E6721092F6187E184F37B', 'RELEASED', '2016-07-18 21:05:05', 0), ('2016_08_28_00_characters.sql', '111B0E4A6770A79093CC3CFFB9CE3475', 'RELEASED', '2016-08-28 21:05:05', 0),('2016_09_14_00_characters_from_335_was_2016_09_13_00_characters.sql','27A04615B11B2CFC3A26778F52F74C071E4F9C54','RELEASED','2016-07-06 18:55:18',0),('2016_09_28_00_characters.sql','18F026197AAF80B9CFB82BE308D7011E','RELEASED','2016-09-28 18:55:18',0);
+INSERT INTO `updates` VALUES ('2014_10_28_00_characters.sql','DCC0367E2784919FBE6ED44D60057179','ARCHIVED','2014-10-28 21:00:00',0),('2015_03_20_00_characters.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_01_characters.sql','894F08B70449A5481FFAF394EE5571D7FC4D8A3A','ARCHIVED','2015-03-21 21:44:15',0),('2015_03_20_02_characters.sql','97D7BE0CAADC79F3F11B9FD296B8C6CD40FE593B','ARCHIVED','2015-03-21 21:44:51',0),('2015_06_26_00_characters_335.sql','f8230a59a9e878a6f54f421d6621f1595bd93861','ARCHIVED','2015-03-21 21:44:51',0),('2016_01_11_00_characters_from_335.sql','AAECE4BA6FDCF0C34A57FADD11DB68DAFD8AE9CD','ARCHIVED','2016-01-10 21:57:56',0),('2016_01_11_01_characters_from_335.sql','F8682A431D50E54BDC4AC0E7DBED21AE8AAB6AD4','ARCHIVED','2015-09-29 22:23:32',0),('2016_01_11_02_characters_from_335.sql','4555A7F35C107E54C13D74D20F141039ED42943E','ARCHIVED','2015-10-29 20:32:37',0),('2016_01_14_from_335_2015_10_06_00_characters.sql','16842FDD7E8547F2260D3312F53EFF8761EFAB35','ARCHIVED','2015-10-11 19:47:41',0),('2016_01_14_from_335_2015_10_07_00_characters.sql','E15AB463CEBE321001D7BFDEA4B662FF618728FD','ARCHIVED','2015-10-11 19:47:41',0),('2016_01_14_from_335_2015_10_12_00_characters.sql','D6F9927BDED72AD0A81D6EC2C6500CBC34A39FA2','ARCHIVED','2015-10-13 01:06:25',0),('2016_01_14_from_335_2015_10_28_00_characters.sql','622A9CA8FCE690429EBE23BA071A37C7A007BF8B','ARCHIVED','2015-10-28 21:49:52',0),('2016_01_14_from_335_2015_11_03_00_characters.sql','CC045717B8FDD9733351E52A5302560CD08AAD57','ARCHIVED','2015-11-03 22:56:17',0),('2016_02_21_from_335_2016_02_10_00_characters.sql','F1B4DA202819CABC7319A4470A2D224A34609E97','RELEASED','2016-02-10 00:00:00',0),('2016_03_12_00_characters.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','RELEASED','2016-03-12 00:00:00',0), ('2016_07_17_00_characters.sql', '41BF94C59FE13A61067E6721092F6187E184F37B', 'RELEASED', '2016-07-18 21:05:05', 0), ('2016_08_28_00_characters.sql', '111B0E4A6770A79093CC3CFFB9CE3475', 'RELEASED', '2016-08-28 21:05:05', 0),('2016_09_14_00_characters_from_335_was_2016_09_13_00_characters.sql','27A04615B11B2CFC3A26778F52F74C071E4F9C54','RELEASED','2016-07-06 18:55:18',0),('2016_09_28_00_characters.sql','18F026197AAF80B9CFB82BE308D7011E','RELEASED','2016-09-28 18:55:18',0),('2016_11_02_00_characters_from_335_was_2016_10_30_00_characters','90B811383CE91A3A790AE995D16542CF','RELEASED','2016-11-02 04:30:18',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/sql/updates/characters/3.3.5/2016_10_30_00_characters.sql b/sql/updates/characters/4.3.4/2016_11_02_00_characters_from_335_was_2016_10_30_00_characters.sql
similarity index 100%
rename from sql/updates/characters/3.3.5/2016_10_30_00_characters.sql
rename to sql/updates/characters/4.3.4/2016_11_02_00_characters_from_335_was_2016_10_30_00_characters.sql
diff --git a/sql/updates/world/3.3.5/2016_10_30_05_world_335.sql b/sql/updates/world/3.3.5/2016_10_30_05_world_335.sql
deleted file mode 100644
index 9583fac21be..00000000000
--- a/sql/updates/world/3.3.5/2016_10_30_05_world_335.sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- 
-UPDATE `gameobject` SET `position_y`=-2148.561035 WHERE `guid`=39881;
diff --git a/sql/updates/world/3.3.5/2016_10_30_06_world_335.sql b/sql/updates/world/3.3.5/2016_10_30_06_world_335.sql
deleted file mode 100644
index ee3a62f15e1..00000000000
--- a/sql/updates/world/3.3.5/2016_10_30_06_world_335.sql
+++ /dev/null
@@ -1,76 +0,0 @@
---
-DELETE FROM `gameobject_template` WHERE `entry` IN (209282, 208046, 202361, 208815, 208596, 208543, 208426, 205581, 204968, 12653, 128972, 160462, 160842, 175328, 175590, 176750, 177493, 177529, 178124, 178248, 178644, 178673, 178963, 179527, 179530, 179531, 180525, 181214, 181375, 181604, 181831, 181838, 181840, 181842, 181844, 184910, 184958, 184981, 185297, 185305, 185862, 186471, 190721, 194645, 195061, 195089, 195641, 196829, 202208, 203044, 203971, 204289, 204385, 204434, 205100, 205547, 206322, 207418, 215404, 215419, 209833, 209898, 210857, 210946, 212348, 213351, 244605);
-INSERT INTO `gameobject_template` (`entry`,  `type`,  `displayId`,  `name`,  `IconName`,  `castBarCaption`,  `unk1`,  `size`,  `Data0`,  `Data1`,  `Data2`,  `Data3`,  `Data4`,  `Data5`,  `Data6`,  `Data7`,  `Data8`,  `Data9`,  `Data10`,  `Data11`,  `Data12`,  `Data13`,  `Data14`,  `Data15`,  `Data16`,  `Data17`,  `Data18`,  `Data19`,  `Data20`,  `Data21`,  `Data22`,  `Data23`,  `AIName`,  `ScriptName`,  `VerifiedBuild`) VALUES
-(209282, 6, 9749, "Paper Pile Trap", "", "", "", 0.7, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 22566),
-(208046, 6, 10406, "Fel Cone", "", "", "", 4, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 16309),
-(202361, 6, 9315, "Rockin' Powder Visual", "", "", "", 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(208815, 6, 49, "Buried Jar", "", "", "", 0.5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 22522),
-(208596, 6, 8083, "Flame Druid Idol Trap", "", "", "", 0.05, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 22522),
-(208543, 6, 9145, "Magmolia", "", "", "", 0.1, 0, 0, 0, 98191, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 19342),
-(208426, 6, 9145, "Cinderweb Egg Sac - Spiderling Trap", "", "", "", 0.4, 0, 0, 0, 97369, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(205581, 6, 9932, "Suspended Starlight - TRAP", "", "", "", 5, 0, 0, 0, 85688, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(204968, 6, 1310, "Glow Trap", "", "", "", 3, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 19342),
-(12653, 6, 327, "Ghost Saber Trap", "", "", "", 1, 0, 20, 0, 5968, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(128972, 6, 327, "Shallow Grave TRAP", "", "", "", 1, 0, 0, 0, 10247, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(160462, 6, 2770, "Mystical Portal", "", "", "", 1, 0, 1, 20, 13461, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(160842, 6, 2770, "Gor'tesh's Lopped Off Head", "", "", "", 1, 0, 0, 50, 13488, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(175328, 6, 2770, "Vaelan Spawn Node", "", "", "", 0.5, 0, 50, 50, 10387, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(175590, 6, 0, "Spire Spider Egg Trap", "", "", "", 1, 0, 0, 0, 16453, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(176750, 6, 327, "Kodo Bones", "", "", "", 1, 0, 0, 0, 17960, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(177493, 6, 327, "Fire of Elune (Trap", "", "", "", 1, 0, 0, 0, 18955, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(177529, 6, 327, "Altar of Elune (Trap", "", "", "", 1, 0, 0, 0, 18993, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(178124, 6, 327, "Resonite Crystal (Trap", "", "", "", 1, 0, 0, 5, 20492, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(178248, 6, 327, "Naga Brazier (trap", "", "", "", 1, 0, 0, 0, 20863, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(178644, 6, 0, "Ryson's All Seeing Eye Trap", "", "", "", 1, 95, 200, 0, 21546, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(178673, 6, 5752, "Consuming Flames Trap", "", "", "", 1.2, 95, 60, 20, 21650, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(178963, 6, 2770, "Incantion of Celebras Trap", "", "", "", 1, 0, 0, 0, 21917, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(179527, 6, 391, "Warpwood Pod - Root", "", "", "", 0.75, 0, 0, 10, 22800, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(179530, 6, 391, "Warpwood Pod - Spore", "", "", "", 0.75, 0, 0, 10, 22821, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(179531, 6, 391, "Warpwood Pod - Summon", "", "", "", 0.75, 0, 0, 10, 22803, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(180525, 6, 6424, "Tonk Control Console Trap", "", "", "", 1, 0, 0, 0, 24935, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(181214, 6, 327, "Necropolis critter spawner", "", "", "", 1, 0, 0, 0, 27866, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(181375, 6, 0, "Midsummer Bonfire Spawn Trap 2", "", "", "", 1, 0, 0, 0, 29114, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(181604, 6, 6771, "TEST Ribbon Pole TRAP", "", "", "", 1, 0, 0, 0, 29708, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(181831, 6, 2770, "Sealed Tome", "", "", "", 1.01, 0, 0, 0, 30765, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(181838, 6, 2770, "Sealed Tome", "", "", "", 1.01, 0, 0, 0, 30762, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(181840, 6, 2770, "Sealed Tome", "", "", "", 1.01, 0, 0, 0, 30764, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(181842, 6, 2770, "Sealed Tome", "", "", "", 1.01, 0, 0, 0, 30763, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(181844, 6, 2770, "Sealed Tome", "", "", "", 1.01, 0, 0, 0, 30766, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(184910, 6, 2373, "Power Converter", "", "", "", 0.5, 0, 0, 0, 37278, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(184958, 6, 7247, "Nether Drake Egg", "", "", "", 1.5, 0, 0, 0, 37574, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(184981, 6, 7244, "Poodad Trap", "", "", "", 0.5, 1716, 0, 0, 37695, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(185297, 6, 1310, "Lianthe's Strongbox", "", "", "", 2, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(185305, 6, 7298, "Fumper Trap", "", "", "", 1, 0, 0, 0, 39217, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(185862, 6, 0, "Fel Cannonball Stack Trap", "", "", "", 1, 0, 0, 0, 40181, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(186471, 6, 2770, "Holiday - Brewfest - Dark Iron - Mug Trap", "", "", "", 1, 0, 0, 3, 42696, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(190721, 6, 0, "Harvested Blight Crystal", "", "", "", 0.5, 0, 0, 0, 52261, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(194645, 6, 5932, "Stone Block Trap", "", "", "", 1, 0, 0, 0, 64055, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(195061, 6, 261, "Glittering Shell Trap", "", "", "", 0.45, 0, 0, 0, 65364, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(195089, 6, 0, "Spirit Candle", "", "", "", 1, 0, 0, 10, 65459, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(195641, 6, 0, "Brazier", "", "", "", 1, 0, 1, 1, 7897, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(196829, 6, 2971, "Living Ire Thyme Linked Trap", "", "", "", 1, 0, 0, 0, 67887, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(202208, 6, 0, "Discarded Supplies (Trap", "", "", "", 1, 0, 0, 0, 72248, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(203044, 6, 0, "Steamwheedle Supplies - Pirate Trap", "", "", "", 1, 0, 0, 0, 76115, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(203971, 6, 0, "Prickly Pear Fruit Trap", "", "", "", 1, 0, 0, 0, 79324, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(204289, 6, 0, "Rock Lobster Trap Activator", "", "", "", 1, 0, 0, 0, 80580, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(204385, 6, 0, "Monstrous Clam Trap Activator", "", "", "", 1, 0, 0, 0, 80911, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(204434, 6, 0, "Lime Crate Trap", "", "", "", 1, 0, 0, 0, 81445, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(205100, 6, 0, "Ferocious Doomweed", "", "", "", 1, 0, 0, 0, 83523, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(205547, 6, 0, "Stray Land Mine (Armed", "", "", "", 1, 0, 50, 5, 85452, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(206322, 6, 0, "Wild Black Dragon Egg Trap", "", "", "", 1, 0, 0, 0, 87009, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(207418, 6, 0, "Chillwind Egg Trap", "", "", "", 1, 0, 0, 0, 93296, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(215404, 6, 9941, "Shroud of Mist", "", "", "", 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 22566),
-(215419, 6, 0, "Luck of the Lotus", "", "", "", 1, 0, 0, 0, 130653, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(209833, 6, 378, "Silk Patch", "", "", "", 1, 0, 0, 13, 105434, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "", "", 17658),
-(209898, 6, 10985, "Watermelon Boat Flag", "", "", "", 1.6, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 19342),
-(210857, 6, 11174, "Dry Fire Wood", "", "", "", 1, 0, 0, 0, 113649, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "", "", 22522),
-(210946, 6, 9145, "Mite Trap", "", "", "", 0.4, 0, 0, 0, 114418, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 22522),
-(212348, 6, 2971, "Ancient Haunt Trigger", "", "", "", 1, 0, 0, 0, 122173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(213351, 6, 2971, "Lushroom Linked Trap", "", "", "", 1, 0, 0, 0, 124427, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
-(244605, 6, 9958, "Underbelly Hoard Trap", "", "", "", 0.5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 22566);
-
-DELETE FROM `gameobject_template_addon` WHERE `entry` IN (202361, 208596, 208426);
-INSERT INTO `gameobject_template_addon` (`entry`, `faction`, `flags`, `mingold`, `maxgold`) VALUES
-(202361, 114, 0, 0, 0),
-(208596, 114, 32, 0, 0),
-(208426, 1924, 0, 0, 0);
diff --git a/sql/updates/world/3.3.5/2016_10_25_00_world.sql b/sql/updates/world/3.3.5/2016_11_02_00_world_from_335_was_2016_10_25_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_25_00_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_00_world_from_335_was_2016_10_25_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_26_00_world.sql b/sql/updates/world/3.3.5/2016_11_02_01_world_from_335_was_2016_10_26_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_26_00_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_01_world_from_335_was_2016_10_26_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_26_01_world.sql b/sql/updates/world/3.3.5/2016_11_02_02_world_from_335_was_2016_10_26_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_26_01_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_02_world_from_335_was_2016_10_26_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_26_02_world.sql b/sql/updates/world/3.3.5/2016_11_02_03_world_from_335_was_2016_10_26_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_26_02_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_03_world_from_335_was_2016_10_26_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_27_00_world_335.sql b/sql/updates/world/3.3.5/2016_11_02_04_world_from_335_was_2016_10_27_00_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2016_10_27_00_world_335.sql
rename to sql/updates/world/3.3.5/2016_11_02_04_world_from_335_was_2016_10_27_00_world_335.sql
index e68c77975f5..1b06115b855 100644
--- a/sql/updates/world/3.3.5/2016_10_27_00_world_335.sql
+++ b/sql/updates/world/3.3.5/2016_11_02_04_world_from_335_was_2016_10_27_00_world_335.sql
@@ -1,4 +1,5 @@
 --
+/*
 DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=20 AND `SourceEntry` IN (247, 6146, 8353, 8354, 8355, 8356, 8357, 8358, 8359, 8360, 8870, 8871, 8872, 8873, 8874, 8875, 11360, 11361, 11439, 11440, 11449, 11450, 11585, 11586, 12896, 12897, 13146, 13147, 13160, 13164, 13408, 13409, 24819, 24820, 24821, 24822, 24823, 24825, 24826, 24827, 24828, 24829, 24830, 24831, 24832, 24833, 24834, 24835, 24836, 24837, 24838, 24839, 24840, 24841, 24842, 24843, 24844, 24845, 24846, 24847, 25239, 25240, 25242, 25246, 25247, 25248, 25249);
 INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
 (20, 0, 247, 0, 1, 8, 0, 2, 0, 0, 0, 0, 0, "", "Show quest only if Sharptalon's Claw (2) quest is rewarded AND"),
@@ -94,3 +95,4 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry
 (19, 0, 13225, 0, 0, 8, 0, 13157, 0, 0, 0, 0, 0, "", ""),
 (19, 0, 13604, 0, 0, 19, 0, 1, 0, 0, 0, 0, 0, "", "Archivum Data Disc quest mark only shown in 10 man"),
 (19, 0, 13817, 0, 0, 19, 0, 2, 0, 0, 0, 0, 0, "", "Heroic: Archivum Data Disc quest mark only shown in 25 man");
+*/
diff --git a/sql/updates/world/3.3.5/2016_10_27_03_world.sql b/sql/updates/world/3.3.5/2016_11_02_05_world_from_335_was_2016_10_27_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_27_03_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_05_world_from_335_was_2016_10_27_03_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_27_04_world.sql b/sql/updates/world/3.3.5/2016_11_02_06_world_from_335_was_2016_10_27_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_27_04_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_06_world_from_335_was_2016_10_27_04_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_27_05_world.sql b/sql/updates/world/3.3.5/2016_11_02_07_world_from_335_was_2016_10_27_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_27_05_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_07_world_from_335_was_2016_10_27_05_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_27_06_world.sql b/sql/updates/world/3.3.5/2016_11_02_08_world_from_335_was_2016_10_27_06_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_27_06_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_08_world_from_335_was_2016_10_27_06_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_28_00_world.sql b/sql/updates/world/3.3.5/2016_11_02_09_world_from_335_was_2016_10_28_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_28_00_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_09_world_from_335_was_2016_10_28_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_28_01_world.sql b/sql/updates/world/3.3.5/2016_11_02_10_world_from_335_was_2016_10_28_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_28_01_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_10_world_from_335_was_2016_10_28_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_29_00_world.sql b/sql/updates/world/3.3.5/2016_11_02_11_world_from_335_was_2016_10_29_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_29_00_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_11_world_from_335_was_2016_10_29_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_29_01_world_335.sql b/sql/updates/world/3.3.5/2016_11_02_12_world_from_335_was_2016_10_29_01_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2016_10_29_01_world_335.sql
rename to sql/updates/world/3.3.5/2016_11_02_12_world_from_335_was_2016_10_29_01_world_335.sql
index 07b49a3d3f7..2d400ff6cdd 100644
--- a/sql/updates/world/3.3.5/2016_10_29_01_world_335.sql
+++ b/sql/updates/world/3.3.5/2016_11_02_12_world_from_335_was_2016_10_29_01_world_335.sql
@@ -1,4 +1,5 @@
 -- 
+/*
 UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (2181, 2182,12347, 2236, 2235, 15184);
 DELETE FROM `smart_scripts` WHERE `entryorguid` IN (2181, 2182, 12347, 2236, 2235, 15184) 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 
@@ -23,3 +24,4 @@ INSERT INTO `creature_text` VALUES (15184, 0, 0, 'Taste blade, mongrel!', 12, 0,
 (15184, 0, 5, 'Get a rope!', 12, 0, 100, 0, 0, 0, 10952, 0, 'Cenarion Hold Infantry - On Aggro'),
 (15184, 0, 6, 'Believe me when I tell you this: You''re gonna wish you weren''t born, sissy!', 12, 0, 100, 0, 0, 0, 10954, 0, 'Cenarion Hold Infantry - On Aggro'),
 (15184, 0, 7, 'Your actions shame us all, $c. I hurt inside as I beat you senseless.', 12, 0, 100, 0, 0, 0, 10955, 0, 'Cenarion Hold Infantry - On Aggro');
+*/
diff --git a/sql/updates/world/3.3.5/2016_10_29_02_world.sql b/sql/updates/world/3.3.5/2016_11_02_13_world_from_335_was_2016_10_29_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_29_02_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_13_world_from_335_was_2016_10_29_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_29_03_world.sql b/sql/updates/world/3.3.5/2016_11_02_14_world_from_335_was_2016_10_29_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_29_03_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_14_world_from_335_was_2016_10_29_03_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_29_04_world.sql b/sql/updates/world/3.3.5/2016_11_02_15_world_from_335_was_2016_10_29_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_29_04_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_15_world_from_335_was_2016_10_29_04_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_29_05_world.sql b/sql/updates/world/3.3.5/2016_11_02_16_world_from_335_was_2016_10_29_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_29_05_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_16_world_from_335_was_2016_10_29_05_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_29_06_world.sql b/sql/updates/world/3.3.5/2016_11_02_17_world_from_335_was_2016_10_29_06_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_29_06_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_17_world_from_335_was_2016_10_29_06_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_29_07_world.sql b/sql/updates/world/3.3.5/2016_11_02_18_world_from_335_was_2016_10_29_07_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_29_07_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_18_world_from_335_was_2016_10_29_07_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_30_00_world.sql b/sql/updates/world/3.3.5/2016_11_02_19_world_from_335_was_2016_10_30_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_30_00_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_19_world_from_335_was_2016_10_30_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_30_02_world.sql b/sql/updates/world/3.3.5/2016_11_02_20_world_from_335_was_2016_10_30_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_30_02_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_20_world_from_335_was_2016_10_30_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_30_03_world.sql b/sql/updates/world/3.3.5/2016_11_02_21_world_from_335_was_2016_10_30_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_30_03_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_21_world_from_335_was_2016_10_30_03_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_30_04_world.sql b/sql/updates/world/3.3.5/2016_11_02_22_world_from_335_was_2016_10_30_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_30_04_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_22_world_from_335_was_2016_10_30_04_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_02_23_world_from_335_was_2016_10_30_05_world_335.sql b/sql/updates/world/3.3.5/2016_11_02_23_world_from_335_was_2016_10_30_05_world_335.sql
new file mode 100644
index 00000000000..da864cf6c9b
--- /dev/null
+++ b/sql/updates/world/3.3.5/2016_11_02_23_world_from_335_was_2016_10_30_05_world_335.sql
@@ -0,0 +1,2 @@
+-- 
+-- UPDATE `gameobject` SET `position_y`=-2148.561035 WHERE `guid`=39881;
diff --git a/sql/updates/world/3.3.5/2016_11_02_24_world_from_335_was_2016_10_30_06_world_335.sql b/sql/updates/world/3.3.5/2016_11_02_24_world_from_335_was_2016_10_30_06_world_335.sql
new file mode 100644
index 00000000000..233a30cfeac
--- /dev/null
+++ b/sql/updates/world/3.3.5/2016_11_02_24_world_from_335_was_2016_10_30_06_world_335.sql
@@ -0,0 +1,78 @@
+--
+DELETE FROM `gameobject_template` WHERE `entry` IN (209833,209898,210857,210946,212348,213351,215404,215419,244605);
+INSERT INTO `gameobject_template` (`entry`,  `type`,  `displayId`,  `name`,  `IconName`,  `castBarCaption`,  `unk1`,  `size`,  `Data0`,  `Data1`,  `Data2`,  `Data3`,  `Data4`,  `Data5`,  `Data6`,  `Data7`,  `Data8`,  `Data9`,  `Data10`,  `Data11`,  `Data12`,  `Data13`,  `Data14`,  `Data15`,  `Data16`,  `Data17`,  `Data18`,  `Data19`,  `Data20`,  `Data21`,  `Data22`,  `Data23`,  `AIName`,  `ScriptName`,  `VerifiedBuild`) VALUES
+-- (12653, 6, 327, "Ghost Saber Trap", "", "", "", 1, 0, 20, 0, 5968, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (128972, 6, 327, "Shallow Grave TRAP", "", "", "", 1, 0, 0, 0, 10247, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (160462, 6, 2770, "Mystical Portal", "", "", "", 1, 0, 1, 20, 13461, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (160842, 6, 2770, "Gor'tesh's Lopped Off Head", "", "", "", 1, 0, 0, 50, 13488, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (175328, 6, 2770, "Vaelan Spawn Node", "", "", "", 0.5, 0, 50, 50, 10387, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (175590, 6, 0, "Spire Spider Egg Trap", "", "", "", 1, 0, 0, 0, 16453, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (176750, 6, 327, "Kodo Bones", "", "", "", 1, 0, 0, 0, 17960, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (177493, 6, 327, "Fire of Elune (Trap", "", "", "", 1, 0, 0, 0, 18955, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (177529, 6, 327, "Altar of Elune (Trap", "", "", "", 1, 0, 0, 0, 18993, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (178124, 6, 327, "Resonite Crystal (Trap", "", "", "", 1, 0, 0, 5, 20492, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (178248, 6, 327, "Naga Brazier (trap", "", "", "", 1, 0, 0, 0, 20863, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (178644, 6, 0, "Ryson's All Seeing Eye Trap", "", "", "", 1, 95, 200, 0, 21546, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (178673, 6, 5752, "Consuming Flames Trap", "", "", "", 1.2, 95, 60, 20, 21650, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (178963, 6, 2770, "Incantion of Celebras Trap", "", "", "", 1, 0, 0, 0, 21917, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (179527, 6, 391, "Warpwood Pod - Root", "", "", "", 0.75, 0, 0, 10, 22800, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (179530, 6, 391, "Warpwood Pod - Spore", "", "", "", 0.75, 0, 0, 10, 22821, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (179531, 6, 391, "Warpwood Pod - Summon", "", "", "", 0.75, 0, 0, 10, 22803, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (180525, 6, 6424, "Tonk Control Console Trap", "", "", "", 1, 0, 0, 0, 24935, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (181214, 6, 327, "Necropolis critter spawner", "", "", "", 1, 0, 0, 0, 27866, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (181375, 6, 0, "Midsummer Bonfire Spawn Trap 2", "", "", "", 1, 0, 0, 0, 29114, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (181604, 6, 6771, "TEST Ribbon Pole TRAP", "", "", "", 1, 0, 0, 0, 29708, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (181831, 6, 2770, "Sealed Tome", "", "", "", 1.01, 0, 0, 0, 30765, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (181838, 6, 2770, "Sealed Tome", "", "", "", 1.01, 0, 0, 0, 30762, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (181840, 6, 2770, "Sealed Tome", "", "", "", 1.01, 0, 0, 0, 30764, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (181842, 6, 2770, "Sealed Tome", "", "", "", 1.01, 0, 0, 0, 30763, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (181844, 6, 2770, "Sealed Tome", "", "", "", 1.01, 0, 0, 0, 30766, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (184910, 6, 2373, "Power Converter", "", "", "", 0.5, 0, 0, 0, 37278, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (184958, 6, 7247, "Nether Drake Egg", "", "", "", 1.5, 0, 0, 0, 37574, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (184981, 6, 7244, "Poodad Trap", "", "", "", 0.5, 1716, 0, 0, 37695, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (185297, 6, 1310, "Lianthe's Strongbox", "", "", "", 2, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (185305, 6, 7298, "Fumper Trap", "", "", "", 1, 0, 0, 0, 39217, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (185862, 6, 0, "Fel Cannonball Stack Trap", "", "", "", 1, 0, 0, 0, 40181, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (186471, 6, 2770, "Holiday - Brewfest - Dark Iron - Mug Trap", "", "", "", 1, 0, 0, 3, 42696, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (190721, 6, 0, "Harvested Blight Crystal", "", "", "", 0.5, 0, 0, 0, 52261, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (194645, 6, 5932, "Stone Block Trap", "", "", "", 1, 0, 0, 0, 64055, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (195061, 6, 261, "Glittering Shell Trap", "", "", "", 0.45, 0, 0, 0, 65364, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (195089, 6, 0, "Spirit Candle", "", "", "", 1, 0, 0, 10, 65459, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (195641, 6, 0, "Brazier", "", "", "", 1, 0, 1, 1, 7897, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (196829, 6, 2971, "Living Ire Thyme Linked Trap", "", "", "", 1, 0, 0, 0, 67887, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (202208, 6, 0, "Discarded Supplies (Trap", "", "", "", 1, 0, 0, 0, 72248, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (202361, 6, 9315, "Rockin' Powder Visual", "", "", "", 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (203044, 6, 0, "Steamwheedle Supplies - Pirate Trap", "", "", "", 1, 0, 0, 0, 76115, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (203971, 6, 0, "Prickly Pear Fruit Trap", "", "", "", 1, 0, 0, 0, 79324, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (204289, 6, 0, "Rock Lobster Trap Activator", "", "", "", 1, 0, 0, 0, 80580, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (204385, 6, 0, "Monstrous Clam Trap Activator", "", "", "", 1, 0, 0, 0, 80911, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (204434, 6, 0, "Lime Crate Trap", "", "", "", 1, 0, 0, 0, 81445, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (204968, 6, 1310, "Glow Trap", "", "", "", 3, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 19342),
+-- (205100, 6, 0, "Ferocious Doomweed", "", "", "", 1, 0, 0, 0, 83523, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (205547, 6, 0, "Stray Land Mine (Armed", "", "", "", 1, 0, 50, 5, 85452, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (205581, 6, 9932, "Suspended Starlight - TRAP", "", "", "", 5, 0, 0, 0, 85688, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (206322, 6, 0, "Wild Black Dragon Egg Trap", "", "", "", 1, 0, 0, 0, 87009, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (207418, 6, 0, "Chillwind Egg Trap", "", "", "", 1, 0, 0, 0, 93296, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (208046, 6, 10406, "Fel Cone", "", "", "", 4, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 16309),
+-- (208426, 6, 9145, "Cinderweb Egg Sac - Spiderling Trap", "", "", "", 0.4, 0, 0, 0, 97369, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+-- (208543, 6, 9145, "Magmolia", "", "", "", 0.1, 0, 0, 0, 98191, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 19342),
+-- (208596, 6, 8083, "Flame Druid Idol Trap", "", "", "", 0.05, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 22522),
+-- (208815, 6, 49, "Buried Jar", "", "", "", 0.5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 22522),
+-- (209282, 6, 9749, "Paper Pile Trap", "", "", "", 0.7, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 22566),
+(209833, 6, 378, "Silk Patch", "", "", "", 1, 0, 0, 13, 105434, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "", "", 17658),
+(209898, 6, 10985, "Watermelon Boat Flag", "", "", "", 1.6, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 19342),
+(210857, 6, 11174, "Dry Fire Wood", "", "", "", 1, 0, 0, 0, 113649, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "", "", 22522),
+(210946, 6, 9145, "Mite Trap", "", "", "", 0.4, 0, 0, 0, 114418, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 22522),
+(212348, 6, 2971, "Ancient Haunt Trigger", "", "", "", 1, 0, 0, 0, 122173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+(213351, 6, 2971, "Lushroom Linked Trap", "", "", "", 1, 0, 0, 0, 124427, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+(215404, 6, 9941, "Shroud of Mist", "", "", "", 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 22566),
+(215419, 6, 0, "Luck of the Lotus", "", "", "", 1, 0, 0, 0, 130653, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019),
+(244605, 6, 9958, "Underbelly Hoard Trap", "", "", "", 0.5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 22566);
+
+/*
+DELETE FROM `gameobject_template_addon` WHERE `entry` IN (202361, 208596, 208426);
+INSERT INTO `gameobject_template_addon` (`entry`, `faction`, `flags`, `mingold`, `maxgold`) VALUES
+(202361, 114, 0, 0, 0),
+(208596, 114, 32, 0, 0),
+(208426, 1924, 0, 0, 0);
+*/
diff --git a/sql/updates/world/3.3.5/2016_10_30_07_world_335.sql b/sql/updates/world/3.3.5/2016_11_02_25_world_from_335_was_2016_10_30_07_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2016_10_30_07_world_335.sql
rename to sql/updates/world/3.3.5/2016_11_02_25_world_from_335_was_2016_10_30_07_world_335.sql
index 048613fc6b6..eadc9509169 100644
--- a/sql/updates/world/3.3.5/2016_10_30_07_world_335.sql
+++ b/sql/updates/world/3.3.5/2016_11_02_25_world_from_335_was_2016_10_30_07_world_335.sql
@@ -1,4 +1,6 @@
 --
+/*
 DELETE FROM `gameobject_template` WHERE `entry`=176592;
 INSERT INTO `gameobject_template` (`entry`,  `type`,  `displayId`,  `name`,  `IconName`,  `castBarCaption`,  `unk1`,  `size`,  `Data0`,  `Data1`,  `Data2`,  `Data3`,  `Data4`,  `Data5`,  `Data6`,  `Data7`,  `Data8`,  `Data9`,  `Data10`,  `Data11`,  `Data12`,  `Data13`,  `Data14`,  `Data15`,  `Data16`,  `Data17`,  `Data18`,  `Data19`,  `Data20`,  `Data21`,  `Data22`,  `Data23`,  `AIName`,  `ScriptName`,  `VerifiedBuild`) VALUES
 (176592, 6, 327, "Shellfish Trap", "", "", "", 1, 0, 0, 0, 17679, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", -18019);
+*/
diff --git a/sql/updates/world/3.3.5/2016_10_30_08_world.sql b/sql/updates/world/3.3.5/2016_11_02_26_world_from_335_was_2016_10_30_08_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_30_08_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_26_world_from_335_was_2016_10_30_08_world.sql
diff --git a/sql/updates/world/3.3.5/2016_10_31_00_world.sql b/sql/updates/world/3.3.5/2016_11_02_27_world_from_335_was_2016_10_31_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_10_31_00_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_27_world_from_335_was_2016_10_31_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_01_00_world.sql b/sql/updates/world/3.3.5/2016_11_02_28_world_from_335_was_2016_11_01_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_11_01_00_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_28_world_from_335_was_2016_11_01_00_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_01_01_world.sql b/sql/updates/world/3.3.5/2016_11_02_29_world_from_335_was_2016_11_01_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_11_01_01_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_29_world_from_335_was_2016_11_01_01_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_01_02_world.sql b/sql/updates/world/3.3.5/2016_11_02_30_world_from_335_was_2016_11_01_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_11_01_02_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_30_world_from_335_was_2016_11_01_02_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_01_03_world.sql b/sql/updates/world/3.3.5/2016_11_02_31_world_from_335_was_2016_11_01_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2016_11_01_03_world.sql
rename to sql/updates/world/3.3.5/2016_11_02_31_world_from_335_was_2016_11_01_03_world.sql
diff --git a/sql/updates/world/3.3.5/2016_11_01_04_world_335.sql b/sql/updates/world/3.3.5/2016_11_02_32_world_from_335_was_2016_11_01_04_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2016_11_01_04_world_335.sql
rename to sql/updates/world/3.3.5/2016_11_02_32_world_from_335_was_2016_11_01_04_world_335.sql
index 68c2840a74d..d83ea142b4d 100644
--- a/sql/updates/world/3.3.5/2016_11_01_04_world_335.sql
+++ b/sql/updates/world/3.3.5/2016_11_02_32_world_from_335_was_2016_11_01_04_world_335.sql
@@ -1,4 +1,5 @@
 -- 
+/*
 SET @Event:=51;
 SET @OGUID:=85097;
 SET @CGUID = 87999;
@@ -90,3 +91,4 @@ DELETE FROM `game_event_gameobject` WHERE `guid` BETWEEN 76237 AND 76550 AND eve
 DELETE FROM `gameobject` WHERE `guid` IN (78695, 78713, 78756, 78582, 78693, 78479, 78690, 78711, 78691, 78694, 78478, 78692, 78696, 78635, 78703, 78592, 78583, 78697, 78669, 78670, 78712, 78710, 78702, 78584, 78715, 78757, 78594, 78593, 78585, 78597, 78595, 78596, 78668, 78698, 78700, 78701, 78714, 78755, 78709, 78704, 78480, 78699);
 DELETE FROM `gameobject_addon` WHERE `guid` IN (78695, 78713, 78756, 78582, 78693, 78479, 78690, 78711, 78691, 78694, 78478, 78692, 78696, 78635, 78703, 78592, 78583, 78697, 78669, 78670, 78712, 78710, 78702, 78584, 78715, 78757, 78594, 78593, 78585, 78597, 78595, 78596, 78668, 78698, 78700, 78701, 78714, 78755, 78709, 78704, 78480, 78699);
 DELETE FROM `game_event_gameobject` WHERE `guid` IN (78695, 78713, 78756, 78582, 78693, 78479, 78690, 78711, 78691, 78694, 78478, 78692, 78696, 78635, 78703, 78592, 78583, 78697, 78669, 78670, 78712, 78710, 78702, 78584, 78715, 78757, 78594, 78593, 78585, 78597, 78595, 78596, 78668, 78698, 78700, 78701, 78714, 78755, 78709, 78704, 78480, 78699);
+*/
diff --git a/sql/updates/world/3.3.5/2016_11_02_00_world_335.sql b/sql/updates/world/3.3.5/2016_11_02_33_world_from_335_was_2016_11_02_00_world_335.sql
similarity index 99%
rename from sql/updates/world/3.3.5/2016_11_02_00_world_335.sql
rename to sql/updates/world/3.3.5/2016_11_02_33_world_from_335_was_2016_11_02_00_world_335.sql
index 86c433ef209..4349725612b 100644
--- a/sql/updates/world/3.3.5/2016_11_02_00_world_335.sql
+++ b/sql/updates/world/3.3.5/2016_11_02_33_world_from_335_was_2016_11_02_00_world_335.sql
@@ -1,4 +1,5 @@
 -- 
+/*
 DELETE FROM `creature` WHERE `id` IN (698, 756);
 UPDATE `creature_template` SET `AIName`='SmartAI' WHERE  `entry` IN (669,784,699);
 DELETE FROM `smart_scripts` WHERE `entryorguid` IN (669,784,699) AND `source_type`=0;
@@ -12,3 +13,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
 (699,0, 1,0,  0, 0,100,0, 500, 1000,2000,2000, 11, 6660, 64, 0,0,0,0,2,0,0,0,0,0,0,0,'Bloodscalp Beastmaster - IC - Cast \'Shoot\''),
 (699,0, 2,3,  2, 0,100,1, 1, 20,   0,   0, 11, 8599,  0, 0,0,0,0,1,0,0,0,0,0,0,0,'Bloodscalp Beastmaster - On 20% Health - Cast Enrage (No Repeat)'),
 (699,0, 3,0, 61, 0,100,0, 0,  0,   0,   0,  1,    0,  0, 0,0,0,0,1,0,0,0,0,0,0,0,'Bloodscalp Beastmaster - On 20% Health - Say Line 0 (No Repeat)');
+*/