127 files changed, 44 insertions, 14 deletions
diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake
index b308e322196..6e79a976cc6 100644
--- a/revision_data.h.in.cmake
+++ b/revision_data.h.in.cmake
@@ -9,7 +9,7 @@
  #define _SOURCE_DIRECTORY          R"(@CMAKE_SOURCE_DIR@)"
  #define _BUILD_DIRECTORY           R"(@BUILDDIR@)"
  #define _MYSQL_EXECUTABLE          R"(@MYSQL_EXECUTABLE@)"
- #define _FULL_DATABASE             "TDB_full_world_335.20061_2020_06_15.sql"
+ #define _FULL_DATABASE             "TDB_full_world_335.20071_2020_07_15.sql"
  #define VER_COMPANYNAME_STR        "TrinityCore Developers"
  #define VER_LEGALCOPYRIGHT_STR     "(c)2008-2019 TrinityCore"
  #define VER_FILEVERSION            0,0,0
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index c66c207842a..ec0018bb2b1 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -72,7 +72,7 @@ CREATE TABLE `account_access` (
   `AccountID` int(10) unsigned NOT NULL,
   `SecurityLevel` tinyint(3) unsigned NOT NULL,
   `RealmID` int(11) NOT NULL DEFAULT '-1',
-  `Comment` VARCHAR(255) DEFAULT NULL,
+  `Comment` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`AccountID`,`RealmID`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1965,7 +1965,8 @@ INSERT INTO `updates` VALUES
 ('2020_04_18_00_auth.sql','BD962B50760771B60F2785027D6957EEF2009240','ARCHIVED','2020-04-18 14:09:28',0),
 ('2020_05_15_00_auth.sql','765389B45F97A02160A58B373D63166F7F7D4427','ARCHIVED','2020-05-15 08:55:56',0),
 ('2020_06_15_00_auth.sql','3158036285CC9A4AB7D39063F9687649A21D0A94','ARCHIVED','2020-06-15 07:48:08',0),
-('2020_06_20_00_auth.sql','85345FAF20B91DA7B157AE1E17DF5B6446C2E109','ARCHIVED','2020-06-11 10:48:00',0);
+('2020_06_20_00_auth.sql','85345FAF20B91DA7B157AE1E17DF5B6446C2E109','ARCHIVED','2020-06-11 10:48:00',0),
+('2020_07_15_00_auth.sql','56748440894EA78C3BE72C4A3F2E97E256E6EE40','ARCHIVED','2020-07-15 10:35:41',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2067,4 +2068,4 @@ SET character_set_client = @saved_cs_client;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-06-15  7:48:11
+-- Dump completed on 2020-07-15 10:35:47
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 0fdf198928d..a4c97454ac2 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -2646,7 +2646,8 @@ INSERT INTO `updates` VALUES
 ('2020_03_16_00_characters.sql','A38437DA80F6A5D35958A09CFC74EE1CDC465BA8','ARCHIVED','2020-03-16 08:47:49',0),
 ('2020_04_15_00_characters.sql','61F7DE3B81C7E479FFF9463A39DF568826926F39','ARCHIVED','2020-04-15 11:03:56',0),
 ('2020_05_15_00_characters.sql','F1C2FECAA4EB623560914E7758E0BB8364CA135A','ARCHIVED','2020-05-15 08:55:56',0),
-('2020_06_15_00_characters.sql','99C4F85580421E928003380D8F992C4EF5E627DF','ARCHIVED','2020-06-15 07:48:08',0);
+('2020_06_15_00_characters.sql','99C4F85580421E928003380D8F992C4EF5E627DF','ARCHIVED','2020-06-15 07:48:08',0),
+('2020_07_15_00_characters.sql','D87627DC6E4D222F68A1F56F0B3B986EF9A590EF','ARCHIVED','2020-07-15 10:35:41',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2813,4 +2814,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-06-15  7:48:11
+-- Dump completed on 2020-07-15 10:35:47
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index cfa61dc118c..81aeed2142f 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -175,6 +175,20 @@ CREATE TABLE `areatrigger_teleport` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `battlefield_template`
+--
+
+DROP TABLE IF EXISTS `battlefield_template`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `battlefield_template` (
+  `TypeId` tinyint(3) unsigned NOT NULL,
+  `ScriptName` varchar(64) NOT NULL DEFAULT '',
+  `comment` text
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `battleground_template`
 --
 
@@ -775,7 +789,7 @@ CREATE TABLE `creature_text_locale` (
   `ID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Locale` varchar(4) NOT NULL,
   `Text` text,
-  PRIMARY KEY (`CreatureID`,`GroupID`,`ID`)
+  PRIMARY KEY (`CreatureID`,`GroupID`,`ID`,`Locale`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -836,7 +850,8 @@ CREATE TABLE `event_scripts` (
   `x` float NOT NULL DEFAULT '0',
   `y` float NOT NULL DEFAULT '0',
   `z` float NOT NULL DEFAULT '0',
-  `o` float NOT NULL DEFAULT '0'
+  `o` float NOT NULL DEFAULT '0',
+  `Comment` varchar(255) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -920,9 +935,9 @@ DROP TABLE IF EXISTS `game_event_battleground_holiday`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `game_event_battleground_holiday` (
-  `eventEntry` tinyint(3) unsigned NOT NULL COMMENT 'Entry of the game event',
-  `bgflag` int(10) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`eventEntry`)
+  `EventEntry` tinyint(3) unsigned NOT NULL COMMENT 'game_event EventEntry identifier',
+  `BattlegroundID` int(3) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`EventEntry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -1350,6 +1365,10 @@ CREATE TABLE `gameobject_template_addon` (
   `flags` int(10) unsigned NOT NULL DEFAULT '0',
   `mingold` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `maxgold` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `artkit0` int(11) NOT NULL DEFAULT '0',
+  `artkit1` int(11) NOT NULL DEFAULT '0',
+  `artkit2` int(11) NOT NULL DEFAULT '0',
+  `artkit3` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`entry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2442,7 +2461,7 @@ CREATE TABLE `pool_members` (
   `type` smallint(10) unsigned NOT NULL,
   `spawnId` int(10) unsigned NOT NULL,
   `poolSpawnId` int(10) unsigned NOT NULL,
-  `chance` double unsigned NOT NULL,
+  `chance` float NOT NULL,
   `description` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`type`,`spawnId`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3516,7 +3535,8 @@ CREATE TABLE `spell_scripts` (
   `x` float NOT NULL DEFAULT '0',
   `y` float NOT NULL DEFAULT '0',
   `z` float NOT NULL DEFAULT '0',
-  `o` float NOT NULL DEFAULT '0'
+  `o` float NOT NULL DEFAULT '0',
+  `Comment` varchar(255) NOT NULL DEFAULT ''
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -3833,6 +3853,7 @@ CREATE TABLE `waypoint_scripts` (
   `z` float NOT NULL DEFAULT '0',
   `o` float NOT NULL DEFAULT '0',
   `guid` int(11) NOT NULL DEFAULT '0',
+  `Comment` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`guid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -3864,4 +3885,4 @@ CREATE TABLE `waypoints` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-06-15  7:48:12
+-- Dump completed on 2020-07-15 10:35:48
diff --git a/sql/updates/auth/3.3.5/2020_06_15_00_auth.sql b/sql/old/3.3.5a/auth/20061_2020_07_15/2020_06_15_00_auth.sql
index 1027a32ee5e..1027a32ee5e 100644
--- a/sql/updates/auth/3.3.5/2020_06_15_00_auth.sql
+++ b/sql/old/3.3.5a/auth/20061_2020_07_15/2020_06_15_00_auth.sql
diff --git a/sql/updates/auth/3.3.5/2020_06_20_00_auth.sql b/sql/old/3.3.5a/auth/20061_2020_07_15/2020_06_20_00_auth.sql
index fdb95bfe335..fdb95bfe335 100644
--- a/sql/updates/auth/3.3.5/2020_06_20_00_auth.sql
+++ b/sql/old/3.3.5a/auth/20061_2020_07_15/2020_06_20_00_auth.sql
diff --git a/sql/updates/characters/3.3.5/2020_06_15_00_characters.sql b/sql/old/3.3.5a/characters/20061_2020_07_15/2020_06_15_00_characters.sql
index fa2e24fcc4c..fa2e24fcc4c 100644
--- a/sql/updates/characters/3.3.5/2020_06_15_00_characters.sql
+++ b/sql/old/3.3.5a/characters/20061_2020_07_15/2020_06_15_00_characters.sql
diff --git a/sql/updates/world/3.3.5/2020_06_15_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_15_00_world.sql
index f0bd64d7c04..f0bd64d7c04 100644
--- a/sql/updates/world/3.3.5/2020_06_15_00_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_15_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_00_world.sql
index 922c2c8161a..922c2c8161a 100644
--- a/sql/updates/world/3.3.5/2020_06_17_00_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_01_world.sql
index 3f418ee2dce..3f418ee2dce 100644
--- a/sql/updates/world/3.3.5/2020_06_17_01_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_02_world.sql
index 03fda171c69..03fda171c69 100644
--- a/sql/updates/world/3.3.5/2020_06_17_02_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_03_world.sql
index 7f926143092..7f926143092 100644
--- a/sql/updates/world/3.3.5/2020_06_17_03_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_04_world.sql
index 41fa08dc5bb..41fa08dc5bb 100644
--- a/sql/updates/world/3.3.5/2020_06_17_04_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_05_world.sql
index 7b1b97b8db4..7b1b97b8db4 100644
--- a/sql/updates/world/3.3.5/2020_06_17_05_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_06_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_06_world.sql
index 778084d031e..778084d031e 100644
--- a/sql/updates/world/3.3.5/2020_06_17_06_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_06_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_07_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_07_world.sql
index 46a68b97bd7..46a68b97bd7 100644
--- a/sql/updates/world/3.3.5/2020_06_17_07_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_07_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_08_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_08_world.sql
index 0fb06c262ea..0fb06c262ea 100644
--- a/sql/updates/world/3.3.5/2020_06_17_08_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_08_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_09_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_09_world.sql
index e8b8e9137cc..e8b8e9137cc 100644
--- a/sql/updates/world/3.3.5/2020_06_17_09_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_09_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_17_10_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_10_world.sql
index 39f53ca6a2e..39f53ca6a2e 100644
--- a/sql/updates/world/3.3.5/2020_06_17_10_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_10_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_18_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_00_world.sql
index 948bb614dab..948bb614dab 100644
--- a/sql/updates/world/3.3.5/2020_06_18_00_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_18_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_01_world.sql
index 862ce73b0e4..862ce73b0e4 100644
--- a/sql/updates/world/3.3.5/2020_06_18_01_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_18_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_02_world.sql
index 68d87e1820d..68d87e1820d 100644
--- a/sql/updates/world/3.3.5/2020_06_18_02_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_18_03_world_335.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_03_world_335.sql
index 4bf63c5b23e..4bf63c5b23e 100644
--- a/sql/updates/world/3.3.5/2020_06_18_03_world_335.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_06_18_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_04_world.sql
index 7b561326915..7b561326915 100644
--- a/sql/updates/world/3.3.5/2020_06_18_04_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_18_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_05_world.sql
index 0732a1b014b..0732a1b014b 100644
--- a/sql/updates/world/3.3.5/2020_06_18_05_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_19_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_19_00_world.sql
index 6ddde608b37..6ddde608b37 100644
--- a/sql/updates/world/3.3.5/2020_06_19_00_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_19_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_20_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_00_world.sql
index 315d28b3f4e..315d28b3f4e 100644
--- a/sql/updates/world/3.3.5/2020_06_20_00_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_20_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_01_world.sql
index dca3b40208c..dca3b40208c 100644
--- a/sql/updates/world/3.3.5/2020_06_20_01_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_20_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_02_world.sql
index 6654825882c..6654825882c 100644
--- a/sql/updates/world/3.3.5/2020_06_20_02_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_20_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_03_world.sql
index bed5b36db36..bed5b36db36 100644
--- a/sql/updates/world/3.3.5/2020_06_20_03_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_20_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_04_world.sql
index cbd34281a95..cbd34281a95 100644
--- a/sql/updates/world/3.3.5/2020_06_20_04_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_20_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_05_world.sql
index 63df7cfeac6..63df7cfeac6 100644
--- a/sql/updates/world/3.3.5/2020_06_20_05_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_20_06_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_06_world.sql
index f0b8a157160..f0b8a157160 100644
--- a/sql/updates/world/3.3.5/2020_06_20_06_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_06_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_22_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_22_00_world.sql
index 4b26e95037c..4b26e95037c 100644
--- a/sql/updates/world/3.3.5/2020_06_22_00_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_22_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_24_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_00_world.sql
index a34ebb739ea..a34ebb739ea 100644
--- a/sql/updates/world/3.3.5/2020_06_24_00_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_24_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_01_world.sql
index 1c1cbd66423..1c1cbd66423 100644
--- a/sql/updates/world/3.3.5/2020_06_24_01_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_24_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_02_world.sql
index 9f4aa567a5b..9f4aa567a5b 100644
--- a/sql/updates/world/3.3.5/2020_06_24_02_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_00_world.sql
index ff7e06e31ef..ff7e06e31ef 100644
--- a/sql/updates/world/3.3.5/2020_06_26_00_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_01_world.sql
index de21fcad423..de21fcad423 100644
--- a/sql/updates/world/3.3.5/2020_06_26_01_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_02_world.sql
index 1f868bc3638..1f868bc3638 100644
--- a/sql/updates/world/3.3.5/2020_06_26_02_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_03_world_335.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_03_world_335.sql
index 8cbf09d7647..8cbf09d7647 100644
--- a/sql/updates/world/3.3.5/2020_06_26_03_world_335.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_04_world.sql
index e692950c67b..e692950c67b 100644
--- a/sql/updates/world/3.3.5/2020_06_26_04_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_05_world.sql
index c2ee21711f3..c2ee21711f3 100644
--- a/sql/updates/world/3.3.5/2020_06_26_05_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_06_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_06_world.sql
index e357cb1c1a5..e357cb1c1a5 100644
--- a/sql/updates/world/3.3.5/2020_06_26_06_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_06_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_07_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_07_world.sql
index 4cfde66c88e..4cfde66c88e 100644
--- a/sql/updates/world/3.3.5/2020_06_26_07_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_07_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_08_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_08_world.sql
index 440ddbddbb7..440ddbddbb7 100644
--- a/sql/updates/world/3.3.5/2020_06_26_08_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_08_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_09_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_09_world.sql
index 4502cc73149..4502cc73149 100644
--- a/sql/updates/world/3.3.5/2020_06_26_09_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_09_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_10_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_10_world.sql
index 6431feff38e..6431feff38e 100644
--- a/sql/updates/world/3.3.5/2020_06_26_10_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_10_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_11_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_11_world.sql
index 94efc4c3338..94efc4c3338 100644
--- a/sql/updates/world/3.3.5/2020_06_26_11_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_11_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_26_12_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_12_world.sql
index c81cdcf64c1..c81cdcf64c1 100644
--- a/sql/updates/world/3.3.5/2020_06_26_12_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_12_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_28_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_28_00_world.sql
index dd941febfe2..dd941febfe2 100644
--- a/sql/updates/world/3.3.5/2020_06_28_00_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_28_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_28_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_28_01_world.sql
index 5f0c607e463..5f0c607e463 100644
--- a/sql/updates/world/3.3.5/2020_06_28_01_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_28_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_29_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_00_world.sql
index 8be85d2d2ee..8be85d2d2ee 100644
--- a/sql/updates/world/3.3.5/2020_06_29_00_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_29_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_01_world.sql
index 9055d737c9a..9055d737c9a 100644
--- a/sql/updates/world/3.3.5/2020_06_29_01_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_29_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_02_world.sql
index 68dd7bf05a2..68dd7bf05a2 100644
--- a/sql/updates/world/3.3.5/2020_06_29_02_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_29_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_03_world.sql
index dc7b07a7b2b..dc7b07a7b2b 100644
--- a/sql/updates/world/3.3.5/2020_06_29_03_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_29_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_04_world.sql
index 474a9f13a48..474a9f13a48 100644
--- a/sql/updates/world/3.3.5/2020_06_29_04_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_29_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_05_world.sql
index da9da9e8d39..da9da9e8d39 100644
--- a/sql/updates/world/3.3.5/2020_06_29_05_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_30_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_00_world.sql
index dc70f8cf025..dc70f8cf025 100644
--- a/sql/updates/world/3.3.5/2020_06_30_00_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_30_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_01_world.sql
index f4ce7c15a67..f4ce7c15a67 100644
--- a/sql/updates/world/3.3.5/2020_06_30_01_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_06_30_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_02_world.sql
index 16ba10c414e..16ba10c414e 100644
--- a/sql/updates/world/3.3.5/2020_06_30_02_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_01_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_00_world.sql
index e240b28e714..e240b28e714 100644
--- a/sql/updates/world/3.3.5/2020_07_01_00_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_01_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_02_world.sql
index ccedb95dd86..ccedb95dd86 100644
--- a/sql/updates/world/3.3.5/2020_07_01_02_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_01_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_03_world.sql
index f2647802191..f2647802191 100644
--- a/sql/updates/world/3.3.5/2020_07_01_03_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_01_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_04_world.sql
index f556f4a51ac..f556f4a51ac 100644
--- a/sql/updates/world/3.3.5/2020_07_01_04_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_01_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_05_world.sql
index 298e1267938..298e1267938 100644
--- a/sql/updates/world/3.3.5/2020_07_01_05_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_01_06_world_335.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_06_world_335.sql
index e208ec61767..e208ec61767 100644
--- a/sql/updates/world/3.3.5/2020_07_01_06_world_335.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_06_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_07_01_07_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_07_world.sql
index 435341dd1e2..435341dd1e2 100644
--- a/sql/updates/world/3.3.5/2020_07_01_07_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_07_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_03_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_00_world.sql
index 53dd79ba69d..53dd79ba69d 100644
--- a/sql/updates/world/3.3.5/2020_07_03_00_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_03_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_01_world.sql
index 8132fc57f8f..8132fc57f8f 100644
--- a/sql/updates/world/3.3.5/2020_07_03_01_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_03_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_02_world.sql
index 0ac05b4b6d2..0ac05b4b6d2 100644
--- a/sql/updates/world/3.3.5/2020_07_03_02_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_03_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_03_world.sql
index 010b1991f95..010b1991f95 100644
--- a/sql/updates/world/3.3.5/2020_07_03_03_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_03_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_04_world.sql
index 3fc9b67dec9..3fc9b67dec9 100644
--- a/sql/updates/world/3.3.5/2020_07_03_04_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_03_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_05_world.sql
index 44f599040b1..44f599040b1 100644
--- a/sql/updates/world/3.3.5/2020_07_03_05_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_03_06_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_06_world.sql
index 739f2333cf0..739f2333cf0 100644
--- a/sql/updates/world/3.3.5/2020_07_03_06_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_06_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_03_07_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_07_world.sql
index af7f537e418..af7f537e418 100644
--- a/sql/updates/world/3.3.5/2020_07_03_07_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_07_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_03_08_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_08_world.sql
index 77c2a3e1c8e..77c2a3e1c8e 100644
--- a/sql/updates/world/3.3.5/2020_07_03_08_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_08_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_03_09_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_09_world.sql
index 65daa61f083..65daa61f083 100644
--- a/sql/updates/world/3.3.5/2020_07_03_09_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_09_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_04_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_00_world.sql
index 22e80936fa5..22e80936fa5 100644
--- a/sql/updates/world/3.3.5/2020_07_04_00_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_04_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_01_world.sql
index 43c1abae10c..43c1abae10c 100644
--- a/sql/updates/world/3.3.5/2020_07_04_01_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_04_02_world_335.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_02_world_335.sql
index e34dc6a4230..e34dc6a4230 100644
--- a/sql/updates/world/3.3.5/2020_07_04_02_world_335.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_07_04_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_03_world.sql
index b64dfd5f48a..b64dfd5f48a 100644
--- a/sql/updates/world/3.3.5/2020_07_04_03_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_00_world.sql
index a5a94c7a4b3..a5a94c7a4b3 100644
--- a/sql/updates/world/3.3.5/2020_07_05_00_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_01_world.sql
index 6179a6b9963..6179a6b9963 100644
--- a/sql/updates/world/3.3.5/2020_07_05_01_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_02_world.sql
index fd346065db4..fd346065db4 100644
--- a/sql/updates/world/3.3.5/2020_07_05_02_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_03_world.sql
index 04d379e13ea..04d379e13ea 100644
--- a/sql/updates/world/3.3.5/2020_07_05_03_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_04_world.sql
index 3cd883f3db1..3cd883f3db1 100644
--- a/sql/updates/world/3.3.5/2020_07_05_04_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_05_world.sql
index 40b85fae510..40b85fae510 100644
--- a/sql/updates/world/3.3.5/2020_07_05_05_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_06_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_06_world.sql
index dfbd82e8920..dfbd82e8920 100644
--- a/sql/updates/world/3.3.5/2020_07_05_06_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_06_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_07_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_07_world.sql
index ed1f1dac5ab..ed1f1dac5ab 100644
--- a/sql/updates/world/3.3.5/2020_07_05_07_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_07_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_08_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_08_world.sql
index 281ff72f1ef..281ff72f1ef 100644
--- a/sql/updates/world/3.3.5/2020_07_05_08_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_08_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_09_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_09_world.sql
index c9beaace5e3..c9beaace5e3 100644
--- a/sql/updates/world/3.3.5/2020_07_05_09_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_09_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_05_10_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_10_world.sql
index 5003b3c0827..5003b3c0827 100644
--- a/sql/updates/world/3.3.5/2020_07_05_10_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_10_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_07_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_07_00_world.sql
index 080e1421c97..080e1421c97 100644
--- a/sql/updates/world/3.3.5/2020_07_07_00_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_07_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_00_world.sql
index 96240f33a57..96240f33a57 100644
--- a/sql/updates/world/3.3.5/2020_07_08_00_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_01_world.sql
index d35b7ed2801..d35b7ed2801 100644
--- a/sql/updates/world/3.3.5/2020_07_08_01_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_02_world.sql
index f5b4879e786..f5b4879e786 100644
--- a/sql/updates/world/3.3.5/2020_07_08_02_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_03_world.sql
index d09d10235e4..d09d10235e4 100644
--- a/sql/updates/world/3.3.5/2020_07_08_03_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_04_world.sql
index 18d1c5bded2..18d1c5bded2 100644
--- a/sql/updates/world/3.3.5/2020_07_08_04_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_05_world.sql
index ae65b9565a4..ae65b9565a4 100644
--- a/sql/updates/world/3.3.5/2020_07_08_05_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_06_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_06_world.sql
index cf9409f9cca..cf9409f9cca 100644
--- a/sql/updates/world/3.3.5/2020_07_08_06_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_06_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_07_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_07_world.sql
index c72665b5e30..c72665b5e30 100644
--- a/sql/updates/world/3.3.5/2020_07_08_07_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_07_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_08_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_08_world.sql
index c207e053ac2..c207e053ac2 100644
--- a/sql/updates/world/3.3.5/2020_07_08_08_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_08_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_09_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_09_world.sql
index aee97f32fc6..aee97f32fc6 100644
--- a/sql/updates/world/3.3.5/2020_07_08_09_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_09_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_10_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_10_world.sql
index 137d6db8588..137d6db8588 100644
--- a/sql/updates/world/3.3.5/2020_07_08_10_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_10_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_11_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_11_world.sql
index cf57044294b..cf57044294b 100644
--- a/sql/updates/world/3.3.5/2020_07_08_11_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_11_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_12_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_12_world.sql
index 9c414c7e189..9c414c7e189 100644
--- a/sql/updates/world/3.3.5/2020_07_08_12_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_12_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_13_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_13_world.sql
index 639b812971e..639b812971e 100644
--- a/sql/updates/world/3.3.5/2020_07_08_13_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_13_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_14_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_14_world.sql
index c3ca2104f31..c3ca2104f31 100644
--- a/sql/updates/world/3.3.5/2020_07_08_14_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_14_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_15_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_15_world.sql
index d4a7364e4b9..d4a7364e4b9 100644
--- a/sql/updates/world/3.3.5/2020_07_08_15_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_15_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_16_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_16_world.sql
index b1ba7495635..b1ba7495635 100644
--- a/sql/updates/world/3.3.5/2020_07_08_16_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_16_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_17_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_17_world.sql
index 2dd7c31cc9b..2dd7c31cc9b 100644
--- a/sql/updates/world/3.3.5/2020_07_08_17_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_17_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_18_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_18_world.sql
index 2af0c883e94..2af0c883e94 100644
--- a/sql/updates/world/3.3.5/2020_07_08_18_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_18_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_19_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_19_world.sql
index 965598599dd..965598599dd 100644
--- a/sql/updates/world/3.3.5/2020_07_08_19_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_19_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_08_20_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_20_world.sql
index c7e33a1353a..c7e33a1353a 100644
--- a/sql/updates/world/3.3.5/2020_07_08_20_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_20_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_09_00_world_335.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_00_world_335.sql
index 7c05d6fc2b1..7c05d6fc2b1 100644
--- a/sql/updates/world/3.3.5/2020_07_09_00_world_335.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2020_07_09_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_01_world.sql
index c70f0386e9b..c70f0386e9b 100644
--- a/sql/updates/world/3.3.5/2020_07_09_01_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_09_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_02_world.sql
index f75708bf4d5..f75708bf4d5 100644
--- a/sql/updates/world/3.3.5/2020_07_09_02_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_02_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_09_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_03_world.sql
index 4fb41ff6525..4fb41ff6525 100644
--- a/sql/updates/world/3.3.5/2020_07_09_03_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_03_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_09_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_04_world.sql
index 7266e9d577f..7266e9d577f 100644
--- a/sql/updates/world/3.3.5/2020_07_09_04_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_04_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_09_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_05_world.sql
index 91b422d95dd..91b422d95dd 100644
--- a/sql/updates/world/3.3.5/2020_07_09_05_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_05_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_14_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_00_world.sql
index 7cad542b909..7cad542b909 100644
--- a/sql/updates/world/3.3.5/2020_07_14_00_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_00_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_14_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_01_world.sql
index db20c22ace8..db20c22ace8 100644
--- a/sql/updates/world/3.3.5/2020_07_14_01_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_01_world.sql
diff --git a/sql/updates/world/3.3.5/2020_07_14_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_02_world.sql
index dd8e0412d63..dd8e0412d63 100644
--- a/sql/updates/world/3.3.5/2020_07_14_02_world.sql
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_02_world.sql
diff --git a/sql/updates/auth/3.3.5/2020_07_15_00_auth.sql b/sql/updates/auth/3.3.5/2020_07_15_00_auth.sql
new file mode 100644
index 00000000000..d0cbe2be812
--- /dev/null
+++ b/sql/updates/auth/3.3.5/2020_07_15_00_auth.sql
@@ -0,0 +1,2 @@
+-- TDB 335.20071 auth
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/characters/3.3.5/2020_07_15_00_characters.sql b/sql/updates/characters/3.3.5/2020_07_15_00_characters.sql
new file mode 100644
index 00000000000..a7c2ce238da
--- /dev/null
+++ b/sql/updates/characters/3.3.5/2020_07_15_00_characters.sql
@@ -0,0 +1,2 @@
+-- TDB 335.20071 characters
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/world/3.3.5/2020_07_15_00_world.sql b/sql/updates/world/3.3.5/2020_07_15_00_world.sql
new file mode 100644
index 00000000000..4126ef8b506
--- /dev/null
+++ b/sql/updates/world/3.3.5/2020_07_15_00_world.sql
@@ -0,0 +1,3 @@
+-- TDB 335.20071 world
+UPDATE `version` SET `db_version`='TDB 335.20071', `cache_id`=20071 LIMIT 1;
+UPDATE `updates` SET `state`='ARCHIVED';