193 files changed, 169 insertions, 209 deletions
diff --git a/sql/updates/1026_(mangos_7113)_01_characters_character_achievement_progress.sql b/sql/updates/1026_(mangos_7113)_01_characters_character_achievement_progress.sql
new file mode 100644
index 00000000000..6f125a6a2e6
--- /dev/null
+++ b/sql/updates/1026_(mangos_7113)_01_characters_character_achievement_progress.sql
@@ -0,0 +1,3 @@
+/*ALTER TABLE character_db_version CHANGE COLUMN required_7100_01_characters_character_spell required_7113_01_characters_character_achievement_progress bit;*/
+
+DELETE FROM character_achievement_progress WHERE counter=0;
+\ No newline at end of file
diff --git a/sql/updates/7141_01_mangos_instance_template.sql b/sql/updates/1028_(mangos_7141)_01_world_instance_template.sql
index b21905f3949..f86b9517a98 100644
--- a/sql/updates/7141_01_mangos_instance_template.sql
+++ b/sql/updates/1028_(mangos_7141)_01_world_instance_template.sql
@@ -1,4 +1,4 @@
-ALTER TABLE db_version CHANGE COLUMN required_7133_02_mangos_spell_loot_template required_7141_01_mangos_instance_template bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7133_02_mangos_spell_loot_template required_7141_01_mangos_instance_template bit;*/
 
 ALTER TABLE instance_template ADD maxPlayersHeroic tinyint(3) unsigned NOT NULL default '0' AFTER maxPlayers;
 
@@ -9,4 +9,4 @@ INSERT INTO instance_template VALUES
 (533,0,80,0,10,25,0,NULL,NULL,NULL,NULL,''),
 (615,0,80,0,10,25,0,NULL,NULL,NULL,NULL,''),
 (616,0,80,0,10,25,0,NULL,NULL,NULL,NULL,''),
-(624,0,80,0,10,25,0,NULL,NULL,NULL,NULL,'');
+(624,0,80,0,10,25,0,NULL,NULL,NULL,NULL,'');
+\ No newline at end of file
diff --git a/sql/updates/1028_(mangos_7147)_01_world_creature_template.sql b/sql/updates/1028_(mangos_7147)_01_world_creature_template.sql
new file mode 100644
index 00000000000..385ec769156
--- /dev/null
+++ b/sql/updates/1028_(mangos_7147)_01_world_creature_template.sql
@@ -0,0 +1,4 @@
+/*ALTER TABLE db_version CHANGE COLUMN required_7141_01_mangos_instance_template required_7147_01_mangos_creature_template bit;*/
+
+UPDATE creature_template
+  SET family = 0 WHERE entry = 1;
+\ No newline at end of file
diff --git a/sql/updates/7150_01_mangos_playercreateinfo_spell.sql b/sql/updates/1028_(mangos_7150)_01_world_playercreateinfo_spell.sql
index aba3540be32..6d4a5993e58 100644
--- a/sql/updates/7150_01_mangos_playercreateinfo_spell.sql
+++ b/sql/updates/1028_(mangos_7150)_01_world_playercreateinfo_spell.sql
@@ -1,4 +1,4 @@
-ALTER TABLE db_version CHANGE COLUMN required_7149_01_mangos_spell_proc_event required_7150_01_mangos_playercreateinfo_spell bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7149_01_mangos_spell_proc_event required_7150_01_mangos_playercreateinfo_spell bit;*/
 
 DELETE FROM `playercreateinfo_spell` WHERE Spell = 58284;
 
@@ -7,4 +7,4 @@ INSERT INTO `playercreateinfo_spell` VALUES
 (2,9,58284,'Chaos Bolt Passive'),
 (5,9,58284,'Chaos Bolt Passive'),
 (7,9,58284,'Chaos Bolt Passive'),
-(10,9,58284,'Chaos Bolt Passive');
+(10,9,58284,'Chaos Bolt Passive');
+\ No newline at end of file
diff --git a/sql/updates/7168_01_mangos_command.sql b/sql/updates/1084_(mangos_7168)_01_world_command.sql
index 67bbd5e3194..b9df9bca12d 100644
--- a/sql/updates/7168_01_mangos_command.sql
+++ b/sql/updates/1084_(mangos_7168)_01_world_command.sql
@@ -1,6 +1,6 @@
-ALTER TABLE db_version CHANGE COLUMN required_7156_01_mangos_spell_proc_event required_7168_01_mangos_command bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7156_01_mangos_spell_proc_event required_7168_01_mangos_command bit;*/
 
 DELETE FROM `command` WHERE `name` IN ('learn','unlearn');
 INSERT INTO `command` VALUES
 ('learn',3,'Syntax: .learn #spell [all]\r\n\r\nSelected character learn a spell of id #spell. If \'all\' provided then all ranks learned.'),
-('unlearn',3,'Syntax: .unlearn #spell [all]\r\n\r\nUnlearn for selected player a spell #spell.  If \'all\' provided then all ranks unlearned.');
+('unlearn',3,'Syntax: .unlearn #spell [all]\r\n\r\nUnlearn for selected player a spell #spell.  If \'all\' provided then all ranks unlearned.');
+\ No newline at end of file
diff --git a/sql/updates/1094_(mangos_7193)_01_world_trinity_string.sql b/sql/updates/1094_(mangos_7193)_01_world_trinity_string.sql
new file mode 100644
index 00000000000..44a390d20f6
--- /dev/null
+++ b/sql/updates/1094_(mangos_7193)_01_world_trinity_string.sql
@@ -0,0 +1,3 @@
+/*ALTER TABLE db_version CHANGE COLUMN required_7175_01_mangos_spell_proc_event required_7193_01_mangos_mangos_string bit;*/
+
+UPDATE mangos_string SET content_default = 'Unit Flags: %u.\nDynamic Flags: %u.\nFaction Template: %u.' WHERE entry = 542;
+\ No newline at end of file
diff --git a/sql/updates/7196_02_mangos_spell_bonus_data.sql b/sql/updates/1108_(mangos_7196)_02_world_spell_bonus_data.sql
index 7d62722bd10..8f6fdbd1463 100644
--- a/sql/updates/7196_02_mangos_spell_bonus_data.sql
+++ b/sql/updates/1108_(mangos_7196)_02_world_spell_bonus_data.sql
@@ -1,4 +1,4 @@
-ALTER TABLE db_version CHANGE COLUMN required_7196_01_mangos_spell_chain required_7196_02_mangos_spell_bonus_data bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7196_01_mangos_spell_chain required_7196_02_mangos_spell_bonus_data bit;*/
 
 -- ----------------------------
 -- Table structure for spell_bonus_data
diff --git a/sql/updates/7198_01_characters_characters.sql b/sql/updates/1108_(mangos_7198)_01_characters_characters.sql
index 5e77c643291..104a31359df 100644
--- a/sql/updates/7198_01_characters_characters.sql
+++ b/sql/updates/1108_(mangos_7198)_01_characters_characters.sql
@@ -1,7 +1,7 @@
-ALTER TABLE character_db_version CHANGE COLUMN required_7113_01_characters_character_achievement_progress required_7198_01_characters_characters bit;
+/*ALTER TABLE character_db_version CHANGE COLUMN required_7113_01_characters_character_achievement_progress required_7198_01_characters_characters bit;*/
 
 UPDATE `characters`.`item_instance` AS `t1`
-INNER JOIN `mangos`.`item_template` AS `t2` ON
+INNER JOIN `world`.`item_template` AS `t2` ON
 `t2`.`entry` = SUBSTRING_INDEX(SUBSTRING_INDEX(`t1`.`data`,' ',4),' ',-1)
 SET `t1`.`data` = CONCAT(
   SUBSTRING_INDEX(SUBSTRING_INDEX(`t1`.`data`,' ',16),' ',-16), ' ',
@@ -14,7 +14,7 @@ SET `t1`.`data` = CONCAT(
 WHERE (`t2`.`spellid_1` = 55884) AND (SUBSTRING_INDEX(data,' ',64) = data AND SUBSTRING_INDEX(data,' ',64-1) <> data);
 
 UPDATE `characters`.`item_instance` AS `t1`
-INNER JOIN `mangos`.`item_template` AS `t2` ON
+INNER JOIN `world`.`item_template` AS `t2` ON
 `t2`.`entry` = SUBSTRING_INDEX(SUBSTRING_INDEX(`t1`.`data`,' ',4),' ',-1)
 SET `t1`.`data` = CONCAT(
   SUBSTRING_INDEX(SUBSTRING_INDEX(`t1`.`data`,' ',16),' ',-16), ' ',
@@ -24,4 +24,4 @@ SET `t1`.`data` = CONCAT(
   IF (`t2`.`spellcharges_4` = 0, 0, IF (SUBSTRING_INDEX(SUBSTRING_INDEX(`t1`.`data`,' ',20),' ',-1) = 0, IF(`t2`.`spellcharges_4` < 0, 4294967295, 1), SUBSTRING_INDEX(SUBSTRING_INDEX(`t1`.`data`,' ',20),' ',-1))), ' ',
   IF (`t2`.`spellcharges_5` = 0, 0, IF (SUBSTRING_INDEX(SUBSTRING_INDEX(`t1`.`data`,' ',21),' ',-1) = 0, IF(`t2`.`spellcharges_5` < 0, 4294967295, 1), SUBSTRING_INDEX(SUBSTRING_INDEX(`t1`.`data`,' ',21),' ',-1))), ' ',
   SUBSTRING_INDEX(SUBSTRING_INDEX(`data`,' ',138),' ',-138+21),' ')
-WHERE (`t2`.`spellid_1` = 55884) AND (SUBSTRING_INDEX(data,' ',138) = data AND SUBSTRING_INDEX(data,' ',138-1) <> data);
+WHERE (`t2`.`spellid_1` = 55884) AND (SUBSTRING_INDEX(data,' ',138) = data AND SUBSTRING_INDEX(data,' ',138-1) <> data);
+\ No newline at end of file
diff --git a/sql/updates/7199_01_mangos_spell_bonus_data.sql b/sql/updates/1108_(mangos_7199)_01_world_spell_bonus_data.sql
index 99d908b183f..89bad64d3e1 100644
--- a/sql/updates/7199_01_mangos_spell_bonus_data.sql
+++ b/sql/updates/1108_(mangos_7199)_01_world_spell_bonus_data.sql
@@ -1,4 +1,4 @@
-ALTER TABLE db_version CHANGE COLUMN required_7196_02_mangos_spell_bonus_data required_7199_01_mangos_spell_bonus_data bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7196_02_mangos_spell_bonus_data required_7199_01_mangos_spell_bonus_data bit;*/
 
 DELETE FROM `spell_bonus_data` WHERE `entry` IN (44614, 139, 49821, 53022, 18265, 31117, 28176);
 INSERT INTO `spell_bonus_data` VALUES
@@ -8,4 +8,4 @@ INSERT INTO `spell_bonus_data` VALUES
 ('53022', '0.14286', '0', '0', 'Priest - Mind Sear Trigger Rank 2'),
 ('18265', '0', '0.1', '0', 'Warlock - Siphon Life'),
 ('31117', '1.8', '0', '0', 'Warlock - Unstable Affliction Dispell'),
-('28176', '0', '0', '0', 'Warlock - Fel Armor');
+('28176', '0', '0', '0', 'Warlock - Fel Armor');
+\ No newline at end of file
diff --git a/sql/updates/1135_(mangos_7207)_01_world_creature.sql b/sql/updates/1135_(mangos_7207)_01_world_creature.sql
new file mode 100644
index 00000000000..7566ba87076
--- /dev/null
+++ b/sql/updates/1135_(mangos_7207)_01_world_creature.sql
@@ -0,0 +1,4 @@
+/*ALTER TABLE db_version CHANGE COLUMN required_7205_01_mangos_spell_chain required_7207_01_mangos_creature bit;*/
+
+ALTER TABLE creature
+  ADD COLUMN `phaseMask` smallint(5) unsigned NOT NULL default '1' AFTER `spawnMask`;
+\ No newline at end of file
diff --git a/sql/updates/1135_(mangos_7207)_02_world_gameobject.sql b/sql/updates/1135_(mangos_7207)_02_world_gameobject.sql
new file mode 100644
index 00000000000..aef9f853f54
--- /dev/null
+++ b/sql/updates/1135_(mangos_7207)_02_world_gameobject.sql
@@ -0,0 +1,4 @@
+/*ALTER TABLE db_version CHANGE COLUMN required_7207_01_mangos_creature required_7207_02_mangos_gameobject bit;*/
+
+ALTER TABLE gameobject
+  ADD COLUMN `phaseMask` smallint(5) unsigned NOT NULL default '1' AFTER `spawnMask`;
+\ No newline at end of file
diff --git a/sql/updates/1135_(mangos_7207)_03_characters_corpse.sql b/sql/updates/1135_(mangos_7207)_03_characters_corpse.sql
new file mode 100644
index 00000000000..b1fa98e2706
--- /dev/null
+++ b/sql/updates/1135_(mangos_7207)_03_characters_corpse.sql
@@ -0,0 +1,4 @@
+/*ALTER TABLE character_db_version CHANGE COLUMN required_7198_01_characters_characters required_7207_03_characters_corpse bit;*/
+
+ALTER TABLE corpse
+  ADD COLUMN `phaseMask` smallint(5) unsigned NOT NULL default '1' AFTER `map`;
+\ No newline at end of file
diff --git a/sql/updates/7209_01_mangos_spell_bonus_data.sql b/sql/updates/1140_(mangos_7209)_01_world_spell_bonus_data.sql
index bbd36b3e636..d4863c51494 100644
--- a/sql/updates/7209_01_mangos_spell_bonus_data.sql
+++ b/sql/updates/1140_(mangos_7209)_01_world_spell_bonus_data.sql
@@ -1,4 +1,4 @@
-ALTER TABLE db_version CHANGE COLUMN required_7207_02_mangos_gameobject required_7209_01_mangos_spell_bonus_data bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7207_02_mangos_gameobject required_7209_01_mangos_spell_bonus_data bit;*/
 
 DELETE FROM `spell_bonus_data` WHERE `entry` IN (53595);
 INSERT INTO `spell_bonus_data` VALUES
diff --git a/sql/updates/7214_01_mangos_command.sql b/sql/updates/1185_(mangos_7214)_01_world_command.sql
index 606ab826b82..841d538fa43 100644
--- a/sql/updates/7214_01_mangos_command.sql
+++ b/sql/updates/1185_(mangos_7214)_01_world_command.sql
@@ -1,8 +1,8 @@
-ALTER TABLE db_version CHANGE COLUMN required_7209_01_mangos_spell_bonus_data required_7214_01_mangos_command bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7209_01_mangos_spell_bonus_data required_7214_01_mangos_command bit;*/
 
 DELETE FROM `command` WHERE `name` IN ('gps','modify phase','npc phase','gobject phase');
 INSERT INTO `command` VALUES
 ('gps',1,'Syntax: .gps [$name|$shift-link]\r\n\r\nDisplay the position information for a selected character or creature (also if player name $name provided then for named player, or if creature/gameobject shift-link provided then pointed creature/gameobject if it loaded). Position information includes X, Y, Z, and orientation, map Id and zone Id'),
 ('modify phase',3,'Syntax: .modify phase #phasemask\r\n\r\nSelected character phasemask changed to #phasemask with related world vision update. Change active until in game phase changed, or GM-mode enable/disable, or re-login. Character pts pasemask update to same value.'),
 ('npc phase',3,'Syntax: .npc phase #phasemask\r\n\r\nSelected unit or pet phasemask changed to #phasemask with related world vision update for players. In creature case state saved to DB and persistent. In pet case change active until in game phase changed for owner, owner re-login, or GM-mode enable/disable..'),
-('gobject phase',3,'Syntax: .gobject phase #guid #phasemask\r\n\r\nGameobject with DB guid #guid phasemask changed to #phasemask with related world vision update for players. Gameobject state saved to DB and persistent.');
+('gobject phase',3,'Syntax: .gobject phase #guid #phasemask\r\n\r\nGameobject with DB guid #guid phasemask changed to #phasemask with related world vision update for players. Gameobject state saved to DB and persistent.');
+\ No newline at end of file
diff --git a/sql/updates/7214_02_mangos_mangos_string.sql b/sql/updates/1185_(mangos_7214)_02_world_trinity_string.sql
index fc4a40a1b1b..90c39d42baa 100644
--- a/sql/updates/7214_02_mangos_mangos_string.sql
+++ b/sql/updates/1185_(mangos_7214)_02_world_trinity_string.sql
@@ -1,5 +1,5 @@
-ALTER TABLE db_version CHANGE COLUMN required_7214_01_mangos_command required_7214_02_mangos_mangos_string bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7214_01_mangos_command required_7214_02_mangos_mangos_string bit;*/
 
 DELETE FROM `mangos_string` WHERE entry = 101;
 INSERT INTO `mangos_string` VALUES
-(101,'Map: %u (%s) Zone: %u (%s) Area: %u (%s) Phase: %u\nX: %f Y: %f Z: %f Orientation: %f\ngrid[%u,%u]cell[%u,%u] InstanceID: %u\n ZoneX: %f ZoneY: %f\nGroundZ: %f FloorZ: %f Have height data (Map: %u VMap: %u)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+(101,'Map: %u (%s) Zone: %u (%s) Area: %u (%s) Phase: %u\nX: %f Y: %f Z: %f Orientation: %f\ngrid[%u,%u]cell[%u,%u] InstanceID: %u\n ZoneX: %f ZoneY: %f\nGroundZ: %f FloorZ: %f Have height data (Map: %u VMap: %u)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+\ No newline at end of file
diff --git a/sql/updates/7214_mangos_spell_proc_event.sql b/sql/updates/1185_(mangos_7214)_03_mangos_spell_proc_event.sql
index e93dcdc04a1..e93dcdc04a1 100644
--- a/sql/updates/7214_mangos_spell_proc_event.sql
+++ b/sql/updates/1185_(mangos_7214)_03_mangos_spell_proc_event.sql
diff --git a/sql/updates/1_wlk_world_scripts.sql b/sql/updates/1_wlk_world_scripts.sql
deleted file mode 100644
index d071d870233..00000000000
--- a/sql/updates/1_wlk_world_scripts.sql
+++ /dev/null
@@ -1,123 +0,0 @@
-DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533039 AND -1533000;
-INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
-(-1533000,'Ahh... welcome to my parlor.',8788,1,0,'anubrekhan SAY_GREET'),
-   (-1533001,'Just a little taste...',8785,1,0,'anubrekhan SAY_AGGRO1'),
-     (-1533002,'There is no way out.',8786,1,0,'anubrekhan SAY_AGGRO2'),
-     (-1533003,'Yes, Run! It makes the blood pump faster!',8787,1,0,'anubrekhan SAY_AGGRO3'),
-     (-1533004,'I hear little hearts beating. Yesss... beating faster now. Soon the beating will stop.',8790,1,0,'anubrekhan SAY_TAUNT1'),
-     (-1533005,'Where to go? What to do? So many choices that all end in pain, end in death.',8791,1,0,'anubrekhan SAY_TAUNT2'),
-     (-1533006,'Which one shall I eat first? So difficult to choose... the all smell so delicious.',8792,1,0,'anubrekhan SAY_TAUNT3'),
-    (-1533007,'Closer now... tasty morsels. I\'ve been too long without food. Without blood to drink.',8793,1,0,'anubrekhan SAY_TAUNT4'),
-    (-1533008,'Shh... it will all be over soon.',8789,1,0,'anubrekhan SAY_SLAY'),
-    (-1533009,'Your old lives, your mortal desires, mean nothing. You are acolytes of the master now, and you will serve the cause without question! The greatest glory is to die in the master\'s service!',8799,1,0,'faerlina SAY_GREET'),
-    (-1533010,'Slay them in the master\'s name!',8794,1,0,'faerlina SAY_AGGRO1'),
-    (-1533011,'You cannot hide from me!',8795,1,0,'faerlina SAY_AGGRO2'),
-    (-1533012,'Kneel before me, worm!',8796,1,0,'faerlina SAY_AGGRO3'),
-    (-1533013,'Run while you still can!',8797,1,0,'faerlina SAY_AGGRO4'),
-    (-1533014,'You have failed!',8800,1,0,'faerlina SAY_SLAY1'),
-    (-1533015,'Pathetic wretch!',8801,1,0,'faerlina SAY_SLAY2'),
-    (-1533016,'The master... will avenge me!',8798,1,0,'faerlina SAY_DEATH'),
-    (-1533017,'Patchwerk want to play!',8909,1,0,'patchwerk SAY_AGGRO1'),
-    (-1533018,'Kel\'Thuzad make Patchwerk his Avatar of War!',8910,1,0,'patchwerk SAY_AGGRO2'),
-    (-1533019,'No more play?',8912,1,0,'patchwerk SAY_SLAY'),
-    (-1533020,'What happened to... Patch...',8911,1,0,'patchwerk SAY_DEATH'),
-    (-1533021,'goes into a berserker rage!',0,2,0,'patchwerk EMOTE_BERSERK'),
-   (-1533022,'becomes enraged!',0,2,0,'patchwerk EMOTE_ENRAGE'),
-    (-1533023,'Stalagg crush you!',8864,1,0,'stalagg SAY_STAL_AGGRO'),
-    (-1533024,'Stalagg kill!',8866,1,0,'stalagg SAY_STAL_SLAY'),
-    (-1533025,'Master save me...',8865,1,0,'stalagg SAY_STAL_DEATH'),
-    (-1533026,'Feed you to master!',8802,1,0,'feugen SAY_FEUG_AGGRO'),
-    (-1533027,'Feugen make master happy!',8804,1,0,'feugen SAY_FEUG_SLAY'),
-    (-1533028,'No... more... Feugen...',8803,1,0,'feugen SAY_FEUG_DEATH'),
-    (-1533029,'You are too late... I... must... OBEY!',8872,1,0,'thaddius SAY_GREET'),
-    (-1533030,'KILL!',8867,1,0,'thaddius SAY_AGGRO1'),
-    (-1533031,'EAT YOUR BONES!',8868,1,0,'thaddius SAY_AGGRO2'),
-    (-1533032,'BREAK YOU!',8869,1,0,'thaddius SAY_AGGRO3'),
-    (-1533033,'You die now!',8877,1,0,'thaddius SAY_SLAY'),
-    (-1533034,'Now YOU feel pain!',8871,1,0,'thaddius SAY_ELECT'),
-    (-1533035,'Thank... you...',8870,1,0,'thaddius SAY_DEATH'),
-    (-1533036,'Pleeease!',8873,1,0,'thaddius SAY_SCREAM1'),
-    (-1533037,'Stop, make it stop!',8874,1,0,'thaddius SAY_SCREAM2'),
-    (-1533038,'Help me! Save me!',8875,1,0,'thaddius SAY_SCREAM3'),
-    (-1533039,'Please, nooo!',8876,1,0,'thaddius SAY_SCREAM4');
-
-DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533074 AND -1533040;
-     INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
-     (-1533040,'Foolishly you have sought your own demise. Brazenly you have disregarded powers beyond your understanding. You have fought hard to invade the realm of the harvester. Now there is only one way out - to walk the lonely path of the damned.',8807,1,0,'gothik SAY_SPEECH'),
-     (-1533041,'Death is the only escape.',8806,1,0,'gothik SAY_KILL'),
-     (-1533042,'I... am... undone!',8805,1,0,'gothik SAY_DEATH'),
-     (-1533043,'I have waited long enough! Now, you face the harvester of souls!',8808,1,0,'gothik SAY_TELEPORT'),
-     (-1533044,'Defend youself!',8892,1,0,'blaumeux SAY_BLAU_AGGRO'),
-     (-1533045,'Come, Zeliek, do not drive them out. Not before we\'ve had our fun.',8896,1,0,'blaumeux SAY_BLAU_TAUNT1'),
-     (-1533046,'I do hope they stay alive long enough for me to... introduce myself.',8897,1,0,'blaumeux SAY_BLAU_TAUNT2'),
-    (-1533047,'The first kill goes to me! Anyone care to wager?',8898,1,0,'blaumeux SAY_BLAU_TAUNT3'),
-    (-1533048,'Your life is mine!',8895,1,0,'blaumeux SAY_BLAU_SPECIAL'),
-    (-1533049,'Who\'s next?',8894,1,0,'blaumeux SAY_BLAU_SLAY'),
-    (-1533050,'Tou... che!',8893,1,0,'blaumeux SAY_BLAU_DEATH'),
-    (-1533051,'Come out and fight, ye wee ninny!',8899,1,0,'korthazz SAY_KORT_AGGRO'),
-    (-1533052,'To arms, ye roustabouts! We\'ve got company!',8903,1,0,'korthazz SAY_KORT_TAUNT1'),
-    (-1533053,'I heard about enough of yer sniveling. Shut yer fly trap \'afore I shut it for ye!',8904,1,0,'korthazz SAY_KORT_TAUNT2'),
-    (-1533054,'I\'m gonna enjoy killin\' these slack-jawed daffodils!',8905,1,0,'korthazz SAY_KORT_TAUNT3'),
-    (-1533055,'I like my meat extra crispy!',8901,1,0,'korthazz SAY_KORT_SPECIAl'),
-    (-1533056,'Next time, bring more friends!',8902,1,0,'korthazz SAY_KORT_SLAY'),
-    (-1533057,'What a bloody waste this is!',8900,1,0,'korthazz SAY_KORT_DEATH'),
-    (-1533058,'Flee, before it\'s too late!',8913,1,0,'zeliek SAY_ZELI_AGGRO'),
-    (-1533059,'Invaders, cease this foolish venture at once! Turn away while you still can!',8917,1,0,'zeliek SAY_ZELI_TAUNT1'),
-    (-1533060,'Perhaps they will come to their senses, and run away as fast as they can!',8918,1,0,'zeliek SAY_ZELI_TAUNT2'),
-    (-1533061,'Do not continue! Turn back while there\'s still time!',8919,1,0,'zeliek SAY_ZELI_TAUNT3'),
-    (-1533062,'I- I have no choice but to obey!',8916,1,0,'zeliek SAY_ZELI_SPECIAL'),
-    (-1533063,'Forgive me!',8915,1,0,'zeliek SAY_ZELI_SLAY'),
-    (-1533064,'It is... as it should be.',8914,1,0,'zeliek SAY_ZELI_DEATH'),
-    (-1533065,'You seek death?',14571,1,0,'rivendare_naxx SAY_RIVE_AGGRO1'),
-    (-1533066,'None shall pass!',14572,1,0,'rivendare_naxx SAY_RIVE_AGGRO2'),
-    (-1533067,'Be still!',14573,1,0,'rivendare_naxx SAY_RIVE_AGGRO3'),
-    (-1533068,'You will find no peace in death.',14574,1,0,'rivendare_naxx SAY_RIVE_SLAY1'),
-    (-1533069,'The master\'s will is done.',14575,1,0,'rivendare_naxx SAY_RIVE_SLAY2'),
-    (-1533070,'Bow to the might of the scourge!',14576,1,0,'rivendare_naxx SAY_RIVE_SPECIAL'),
-    (-1533071,'Enough prattling. Let them come! We shall grind their bones to dust.',14577,1,0,'rivendare_naxx SAY_RIVE_TAUNT1'),
-    (-1533072,'Conserve your anger! Harness your rage! You will all have outlets for your frustration soon enough.',14578,1,0,'rivendare_naxx SAY_RIVE_TAUNT2'),
-    (-1533073,'Life is meaningless. It is in death that we are truly tested.',14579,1,0,'rivendare_naxx SAY_RIVE_TAUNT3'),
-    (-1533074,'Death... will not stop me...',14580,1,0,'rivendare_naxx SAY_RIVE_DEATH');
-
-UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=16062;
-UPDATE `creature_template` SET `ScriptName`='boss_rivendare_naxx' WHERE `entry`=30549;
-
-DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533108 AND -1533075;
-     INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
-     (-1533075,'Glory to the master!',8845,1,0,'noth SAY_AGGRO1'),
-     (-1533076,'Your life is forfeit!',8846,1,0,'noth SAY_AGGRO2'),
-     (-1533077,'Die, trespasser!',8847,1,0,'noth SAY_AGGRO3'),
-     (-1533078,'Rise, my soldiers! Rise and fight once more!',8851,1,0,'noth SAY_SUMMON'),
-     (-1533079,'My task is done!',8849,1,0,'noth SAY_SLAY1'),
-     (-1533080,'Breathe no more!',8850,1,0,'noth SAY_SLAY2'),
-     (-1533081,'I will serve the master... in... death!',8848,1,0,'noth SAY_DEATH'),
-    (-1533082,'takes in a deep breath...',0,2,0,'sapphiron EMOTE_BREATH'),
-    (-1533083,'enrages!',0,2,0,'sapphiron EMOTE_ENRAGE'),
-    (-1533084,'Our preparations continue as planned, master.',14467,1,0,'kelthuzad SAY_SAPP_DIALOG1'),
-    (-1533085,'It is good that you serve me so faithfully. Soon, all will serve the Lich King and in the end, you shall be rewarded...so long as you do not falter.',8881,1,0,'kelthuzad SAY_SAPP_DIALOG2_LICH'),
-    (-1533086,'I see no complications... Wait... What is this?',14468,1,0,'kelthuzad SAY_SAPP_DIALOG3'),
-    (-1533087,'Your security measures have failed! See to this interruption immediately!',8882,1,0,'kelthuzad SAY_SAPP_DIALOG4_LICH'),
-    (-1533088,'Yes, master!',14469,1,0,'kelthuzad SAY_SAPP_DIALOG5'),
-    (-1533089,'No!!! A curse upon you, interlopers! The armies of the Lich King will hunt you down. You will not escape your fate...',14484,1,0,'kelthuzad SAY_CAT_DIED'),
-    (-1533090,'Who dares violate the sanctity of my domain? Be warned, all who trespass here are doomed.',14463,1,0,'kelthuzad SAY_TAUNT1'),
-    (-1533091,'Fools, you think yourselves triumphant? You have only taken one step closer to the abyss! ',14464,1,0,'kelthuzad SAY_TAUNT2'),
-    (-1533092,'I grow tired of these games. Proceed, and I will banish your souls to oblivion!',14465,1,0,'kelthuzad SAY_TAUNT3'),
-    (-1533093,'You have no idea what horrors lie ahead. You have seen nothing! The frozen heart of Naxxramas awaits you!',14466,1,0,'kelthuzad SAY_TAUNT4'),
-    (-1533094,'Pray for mercy!',14475,1,0,'kelthuzad SAY_AGGRO1'),
-    (-1533095,'Scream your dying breath!',14476,1,0,'kelthuzad SAY_AGGRO2'),
-    (-1533096,'The end is upon you!',14477,1,0,'kelthuzad SAY_AGGRO3'),
-    (-1533097,'The dark void awaits you!',14478,1,0,'kelthuzad SAY_SLAY1'),
-    (-1533098,'<Kel\'Thuzad cackles maniacally!>',14479,1,0,'kelthuzad SAY_SLAY2'),
-    (-1533099,'AAAAGHHH!... Do not rejoice... your victory is a hollow one... for I shall return with powers beyond your imagining!',14480,1,0,'kelthuzad SAY_DEATH'),
-    (-1533100,'Your soul, is bound to me now!',14472,1,0,'kelthuzad SAY_CHAIN1'),
-    (-1533101,'There will be no escape!',14473,1,0,'kelthuzad SAY_CHAIN2'),
-    (-1533102,'I will freeze the blood in your veins!',14474,1,0,'kelthuzad SAY_FROST_BLAST'),
-    (-1533103,'Master! I require aid! ',14470,1,0,'kelthuzad SAY_REQUEST_AID'),
-    (-1533104,'Very well... warriors of the frozen wastes, rise up! I command you to fight, kill, and die for your master. Let none survive...',0,1,0,'kelthuzad SAY_ANSWER_REQUEST'),
-    (-1533105,'Minions, servants, soldiers of the cold dark, obey the call of Kel\'Thuzad!',14471,1,0,'kelthuzad SAY_SUMMON_MINIONS'),
-    (-1533106,'Your petty magics are no challenge to the might of the Scourge! ',14481,1,0,'kelthuzad SAY_SPECIAL1_MANA_DET'),
-    (-1533107,'Enough! I grow tired of these distractions! ',14483,1,0,'kelthuzad SAY_SPECIAL3_MANA_DET'),
-    (-1533108,'Fools, you have spread your powers too thin. Be free, my minions!',14482,1,0,'kelthuzad SAY_SPECIAL2_DISPELL');
-	
-	UPDATE `script_texts` SET `sound`=8902 WHERE `entry`=-1533055;
-    UPDATE `script_texts` SET `sound`=8901 WHERE `entry`=-1533056;
-\ No newline at end of file
diff --git a/sql/updates/1_world_scripts.sql b/sql/updates/1_world_scripts.sql
new file mode 100644
index 00000000000..743984d3ad0
--- /dev/null
+++ b/sql/updates/1_world_scripts.sql
@@ -0,0 +1,123 @@
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533039 AND -1533000;
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1533000,'Ahh... welcome to my parlor.',8788,1,0,'anubrekhan SAY_GREET'),
+(-1533001,'Just a little taste...',8785,1,0,'anubrekhan SAY_AGGRO1'),
+(-1533002,'There is no way out.',8786,1,0,'anubrekhan SAY_AGGRO2'),
+(-1533003,'Yes, Run! It makes the blood pump faster!',8787,1,0,'anubrekhan SAY_AGGRO3'),
+(-1533004,'I hear little hearts beating. Yesss... beating faster now. Soon the beating will stop.',8790,1,0,'anubrekhan SAY_TAUNT1'),
+(-1533005,'Where to go? What to do? So many choices that all end in pain, end in death.',8791,1,0,'anubrekhan SAY_TAUNT2'),
+(-1533006,'Which one shall I eat first? So difficult to choose... the all smell so delicious.',8792,1,0,'anubrekhan SAY_TAUNT3'),
+(-1533007,'Closer now... tasty morsels. I\'ve been too long without food. Without blood to drink.',8793,1,0,'anubrekhan SAY_TAUNT4'),
+(-1533008,'Shh... it will all be over soon.',8789,1,0,'anubrekhan SAY_SLAY'),
+(-1533009,'Your old lives, your mortal desires, mean nothing. You are acolytes of the master now, and you will serve the cause without question! The greatest glory is to die in the master\'s service!',8799,1,0,'faerlina SAY_GREET'),
+(-1533010,'Slay them in the master\'s name!',8794,1,0,'faerlina SAY_AGGRO1'),
+(-1533011,'You cannot hide from me!',8795,1,0,'faerlina SAY_AGGRO2'),
+(-1533012,'Kneel before me, worm!',8796,1,0,'faerlina SAY_AGGRO3'),
+(-1533013,'Run while you still can!',8797,1,0,'faerlina SAY_AGGRO4'),
+(-1533014,'You have failed!',8800,1,0,'faerlina SAY_SLAY1'),
+(-1533015,'Pathetic wretch!',8801,1,0,'faerlina SAY_SLAY2'),
+(-1533016,'The master... will avenge me!',8798,1,0,'faerlina SAY_DEATH'),
+(-1533017,'Patchwerk want to play!',8909,1,0,'patchwerk SAY_AGGRO1'),
+(-1533018,'Kel\'Thuzad make Patchwerk his Avatar of War!',8910,1,0,'patchwerk SAY_AGGRO2'),
+(-1533019,'No more play?',8912,1,0,'patchwerk SAY_SLAY'),
+(-1533020,'What happened to... Patch...',8911,1,0,'patchwerk SAY_DEATH'),
+(-1533021,'goes into a berserker rage!',0,2,0,'patchwerk EMOTE_BERSERK'),
+(-1533022,'becomes enraged!',0,2,0,'patchwerk EMOTE_ENRAGE'),
+(-1533023,'Stalagg crush you!',8864,1,0,'stalagg SAY_STAL_AGGRO'),
+(-1533024,'Stalagg kill!',8866,1,0,'stalagg SAY_STAL_SLAY'),
+(-1533025,'Master save me...',8865,1,0,'stalagg SAY_STAL_DEATH'),
+(-1533026,'Feed you to master!',8802,1,0,'feugen SAY_FEUG_AGGRO'),
+(-1533027,'Feugen make master happy!',8804,1,0,'feugen SAY_FEUG_SLAY'),
+(-1533028,'No... more... Feugen...',8803,1,0,'feugen SAY_FEUG_DEATH'),
+(-1533029,'You are too late... I... must... OBEY!',8872,1,0,'thaddius SAY_GREET'),
+(-1533030,'KILL!',8867,1,0,'thaddius SAY_AGGRO1'),
+(-1533031,'EAT YOUR BONES!',8868,1,0,'thaddius SAY_AGGRO2'),
+(-1533032,'BREAK YOU!',8869,1,0,'thaddius SAY_AGGRO3'),
+(-1533033,'You die now!',8877,1,0,'thaddius SAY_SLAY'),
+(-1533034,'Now YOU feel pain!',8871,1,0,'thaddius SAY_ELECT'),
+(-1533035,'Thank... you...',8870,1,0,'thaddius SAY_DEATH'),
+(-1533036,'Pleeease!',8873,1,0,'thaddius SAY_SCREAM1'),
+(-1533037,'Stop, make it stop!',8874,1,0,'thaddius SAY_SCREAM2'),
+(-1533038,'Help me! Save me!',8875,1,0,'thaddius SAY_SCREAM3'),
+(-1533039,'Please, nooo!',8876,1,0,'thaddius SAY_SCREAM4');
+
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533074 AND -1533040;
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1533040,'Foolishly you have sought your own demise. Brazenly you have disregarded powers beyond your understanding. You have fought hard to invade the realm of the harvester. Now there is only one way out - to walk the lonely path of the damned.',8807,1,0,'gothik SAY_SPEECH'),
+(-1533041,'Death is the only escape.',8806,1,0,'gothik SAY_KILL'),
+(-1533042,'I... am... undone!',8805,1,0,'gothik SAY_DEATH'),
+(-1533043,'I have waited long enough! Now, you face the harvester of souls!',8808,1,0,'gothik SAY_TELEPORT'),
+(-1533044,'Defend youself!',8892,1,0,'blaumeux SAY_BLAU_AGGRO'),
+(-1533045,'Come, Zeliek, do not drive them out. Not before we\'ve had our fun.',8896,1,0,'blaumeux SAY_BLAU_TAUNT1'),
+(-1533046,'I do hope they stay alive long enough for me to... introduce myself.',8897,1,0,'blaumeux SAY_BLAU_TAUNT2'),
+(-1533047,'The first kill goes to me! Anyone care to wager?',8898,1,0,'blaumeux SAY_BLAU_TAUNT3'),
+(-1533048,'Your life is mine!',8895,1,0,'blaumeux SAY_BLAU_SPECIAL'),
+(-1533049,'Who\'s next?',8894,1,0,'blaumeux SAY_BLAU_SLAY'),
+(-1533050,'Tou... che!',8893,1,0,'blaumeux SAY_BLAU_DEATH'),
+(-1533051,'Come out and fight, ye wee ninny!',8899,1,0,'korthazz SAY_KORT_AGGRO'),
+(-1533052,'To arms, ye roustabouts! We\'ve got company!',8903,1,0,'korthazz SAY_KORT_TAUNT1'),
+(-1533053,'I heard about enough of yer sniveling. Shut yer fly trap \'afore I shut it for ye!',8904,1,0,'korthazz SAY_KORT_TAUNT2'),
+(-1533054,'I\'m gonna enjoy killin\' these slack-jawed daffodils!',8905,1,0,'korthazz SAY_KORT_TAUNT3'),
+(-1533055,'I like my meat extra crispy!',8901,1,0,'korthazz SAY_KORT_SPECIAl'),
+(-1533056,'Next time, bring more friends!',8902,1,0,'korthazz SAY_KORT_SLAY'),
+(-1533057,'What a bloody waste this is!',8900,1,0,'korthazz SAY_KORT_DEATH'),
+(-1533058,'Flee, before it\'s too late!',8913,1,0,'zeliek SAY_ZELI_AGGRO'),
+(-1533059,'Invaders, cease this foolish venture at once! Turn away while you still can!',8917,1,0,'zeliek SAY_ZELI_TAUNT1'),
+(-1533060,'Perhaps they will come to their senses, and run away as fast as they can!',8918,1,0,'zeliek SAY_ZELI_TAUNT2'),
+(-1533061,'Do not continue! Turn back while there\'s still time!',8919,1,0,'zeliek SAY_ZELI_TAUNT3'),
+(-1533062,'I- I have no choice but to obey!',8916,1,0,'zeliek SAY_ZELI_SPECIAL'),
+(-1533063,'Forgive me!',8915,1,0,'zeliek SAY_ZELI_SLAY'),
+(-1533064,'It is... as it should be.',8914,1,0,'zeliek SAY_ZELI_DEATH'),
+(-1533065,'You seek death?',14571,1,0,'rivendare_naxx SAY_RIVE_AGGRO1'),
+(-1533066,'None shall pass!',14572,1,0,'rivendare_naxx SAY_RIVE_AGGRO2'),
+(-1533067,'Be still!',14573,1,0,'rivendare_naxx SAY_RIVE_AGGRO3'),
+(-1533068,'You will find no peace in death.',14574,1,0,'rivendare_naxx SAY_RIVE_SLAY1'),
+(-1533069,'The master\'s will is done.',14575,1,0,'rivendare_naxx SAY_RIVE_SLAY2'),
+(-1533070,'Bow to the might of the scourge!',14576,1,0,'rivendare_naxx SAY_RIVE_SPECIAL'),
+(-1533071,'Enough prattling. Let them come! We shall grind their bones to dust.',14577,1,0,'rivendare_naxx SAY_RIVE_TAUNT1'),
+(-1533072,'Conserve your anger! Harness your rage! You will all have outlets for your frustration soon enough.',14578,1,0,'rivendare_naxx SAY_RIVE_TAUNT2'),
+(-1533073,'Life is meaningless. It is in death that we are truly tested.',14579,1,0,'rivendare_naxx SAY_RIVE_TAUNT3'),
+(-1533074,'Death... will not stop me...',14580,1,0,'rivendare_naxx SAY_RIVE_DEATH');
+
+UPDATE `creature_template` SET `ScriptName`='' WHERE `entry`=16062;
+UPDATE `creature_template` SET `ScriptName`='boss_rivendare_naxx' WHERE `entry`=30549;
+
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1533108 AND -1533075;
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+(-1533075,'Glory to the master!',8845,1,0,'noth SAY_AGGRO1'),
+(-1533076,'Your life is forfeit!',8846,1,0,'noth SAY_AGGRO2'),
+(-1533077,'Die, trespasser!',8847,1,0,'noth SAY_AGGRO3'),
+(-1533078,'Rise, my soldiers! Rise and fight once more!',8851,1,0,'noth SAY_SUMMON'),
+(-1533079,'My task is done!',8849,1,0,'noth SAY_SLAY1'),
+(-1533080,'Breathe no more!',8850,1,0,'noth SAY_SLAY2'),
+(-1533081,'I will serve the master... in... death!',8848,1,0,'noth SAY_DEATH'),
+(-1533082,'takes in a deep breath...',0,2,0,'sapphiron EMOTE_BREATH'),
+(-1533083,'enrages!',0,2,0,'sapphiron EMOTE_ENRAGE'),
+(-1533084,'Our preparations continue as planned, master.',14467,1,0,'kelthuzad SAY_SAPP_DIALOG1'),
+(-1533085,'It is good that you serve me so faithfully. Soon, all will serve the Lich King and in the end, you shall be rewarded...so long as you do not falter.',8881,1,0,'kelthuzad SAY_SAPP_DIALOG2_LICH'),
+(-1533086,'I see no complications... Wait... What is this?',14468,1,0,'kelthuzad SAY_SAPP_DIALOG3'),
+(-1533087,'Your security measures have failed! See to this interruption immediately!',8882,1,0,'kelthuzad SAY_SAPP_DIALOG4_LICH'),
+(-1533088,'Yes, master!',14469,1,0,'kelthuzad SAY_SAPP_DIALOG5'),
+(-1533089,'No!!! A curse upon you, interlopers! The armies of the Lich King will hunt you down. You will not escape your fate...',14484,1,0,'kelthuzad SAY_CAT_DIED'),
+(-1533090,'Who dares violate the sanctity of my domain? Be warned, all who trespass here are doomed.',14463,1,0,'kelthuzad SAY_TAUNT1'),
+(-1533091,'Fools, you think yourselves triumphant? You have only taken one step closer to the abyss! ',14464,1,0,'kelthuzad SAY_TAUNT2'),
+(-1533092,'I grow tired of these games. Proceed, and I will banish your souls to oblivion!',14465,1,0,'kelthuzad SAY_TAUNT3'),
+(-1533093,'You have no idea what horrors lie ahead. You have seen nothing! The frozen heart of Naxxramas awaits you!',14466,1,0,'kelthuzad SAY_TAUNT4'),
+(-1533094,'Pray for mercy!',14475,1,0,'kelthuzad SAY_AGGRO1'),
+(-1533095,'Scream your dying breath!',14476,1,0,'kelthuzad SAY_AGGRO2'),
+(-1533096,'The end is upon you!',14477,1,0,'kelthuzad SAY_AGGRO3'),
+(-1533097,'The dark void awaits you!',14478,1,0,'kelthuzad SAY_SLAY1'),
+(-1533098,'<Kel\'Thuzad cackles maniacally!>',14479,1,0,'kelthuzad SAY_SLAY2'),
+(-1533099,'AAAAGHHH!... Do not rejoice... your victory is a hollow one... for I shall return with powers beyond your imagining!',14480,1,0,'kelthuzad SAY_DEATH'),
+(-1533100,'Your soul, is bound to me now!',14472,1,0,'kelthuzad SAY_CHAIN1'),
+(-1533101,'There will be no escape!',14473,1,0,'kelthuzad SAY_CHAIN2'),
+(-1533102,'I will freeze the blood in your veins!',14474,1,0,'kelthuzad SAY_FROST_BLAST'),
+(-1533103,'Master! I require aid! ',14470,1,0,'kelthuzad SAY_REQUEST_AID'),
+(-1533104,'Very well... warriors of the frozen wastes, rise up! I command you to fight, kill, and die for your master. Let none survive...',0,1,0,'kelthuzad SAY_ANSWER_REQUEST'),
+(-1533105,'Minions, servants, soldiers of the cold dark, obey the call of Kel\'Thuzad!',14471,1,0,'kelthuzad SAY_SUMMON_MINIONS'),
+(-1533106,'Your petty magics are no challenge to the might of the Scourge! ',14481,1,0,'kelthuzad SAY_SPECIAL1_MANA_DET'),
+(-1533107,'Enough! I grow tired of these distractions! ',14483,1,0,'kelthuzad SAY_SPECIAL3_MANA_DET'),
+(-1533108,'Fools, you have spread your powers too thin. Be free, my minions!',14482,1,0,'kelthuzad SAY_SPECIAL2_DISPELL');
+	
+UPDATE `script_texts` SET `sound`=8902 WHERE `entry`=-1533055;
+UPDATE `script_texts` SET `sound`=8901 WHERE `entry`=-1533056;
+\ No newline at end of file
diff --git a/sql/updates/1016_world.sql b/sql/updates/2.4.3_updates/1016_world.sql
index db485eac489..db485eac489 100644
--- a/sql/updates/1016_world.sql
+++ b/sql/updates/2.4.3_updates/1016_world.sql
diff --git a/sql/updates/1016_world_scripts.sql b/sql/updates/2.4.3_updates/1016_world_scripts.sql
index 7edaa0c49e1..7edaa0c49e1 100644
--- a/sql/updates/1016_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/1016_world_scripts.sql
diff --git a/sql/updates/102_world.sql b/sql/updates/2.4.3_updates/102_world.sql
index 6cbf3d1a6b4..6cbf3d1a6b4 100644
--- a/sql/updates/102_world.sql
+++ b/sql/updates/2.4.3_updates/102_world.sql
diff --git a/sql/updates/112_world_scripts.sql b/sql/updates/2.4.3_updates/112_world_scripts.sql
index e48ed250741..e48ed250741 100644
--- a/sql/updates/112_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/112_world_scripts.sql
diff --git a/sql/updates/116_world.sql b/sql/updates/2.4.3_updates/116_world.sql
index 7627dfb4aa3..7627dfb4aa3 100644
--- a/sql/updates/116_world.sql
+++ b/sql/updates/2.4.3_updates/116_world.sql
diff --git a/sql/updates/117_world_scripts.sql b/sql/updates/2.4.3_updates/117_world_scripts.sql
index 794258ba710..794258ba710 100644
--- a/sql/updates/117_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/117_world_scripts.sql
diff --git a/sql/updates/11_characters.sql b/sql/updates/2.4.3_updates/11_characters.sql
index a9a002270fb..a9a002270fb 100644
--- a/sql/updates/11_characters.sql
+++ b/sql/updates/2.4.3_updates/11_characters.sql
diff --git a/sql/updates/120_world.sql b/sql/updates/2.4.3_updates/120_world.sql
index 3f3b231e830..3f3b231e830 100644
--- a/sql/updates/120_world.sql
+++ b/sql/updates/2.4.3_updates/120_world.sql
diff --git a/sql/updates/123_world_scripts.sql b/sql/updates/2.4.3_updates/123_world_scripts.sql
index b5f9305e30e..b5f9305e30e 100644
--- a/sql/updates/123_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/123_world_scripts.sql
diff --git a/sql/updates/125_world_scripts.sql b/sql/updates/2.4.3_updates/125_world_scripts.sql
index 9994c0e7af7..9994c0e7af7 100644
--- a/sql/updates/125_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/125_world_scripts.sql
diff --git a/sql/updates/133_world_scripts.sql b/sql/updates/2.4.3_updates/133_world_scripts.sql
index 057f7c44e81..057f7c44e81 100644
--- a/sql/updates/133_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/133_world_scripts.sql
diff --git a/sql/updates/140_world.sql b/sql/updates/2.4.3_updates/140_world.sql
index 6a7389602b6..6a7389602b6 100644
--- a/sql/updates/140_world.sql
+++ b/sql/updates/2.4.3_updates/140_world.sql
diff --git a/sql/updates/145_world_scripts.sql b/sql/updates/2.4.3_updates/145_world_scripts.sql
index 5ec3702b171..5ec3702b171 100644
--- a/sql/updates/145_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/145_world_scripts.sql
diff --git a/sql/updates/146_world.sql b/sql/updates/2.4.3_updates/146_world.sql
index 31999cd97e4..31999cd97e4 100644
--- a/sql/updates/146_world.sql
+++ b/sql/updates/2.4.3_updates/146_world.sql
diff --git a/sql/updates/147_world.sql b/sql/updates/2.4.3_updates/147_world.sql
index c6e75d41070..c6e75d41070 100644
--- a/sql/updates/147_world.sql
+++ b/sql/updates/2.4.3_updates/147_world.sql
diff --git a/sql/updates/152_world.sql b/sql/updates/2.4.3_updates/152_world.sql
index 3b3d09c56d3..3b3d09c56d3 100644
--- a/sql/updates/152_world.sql
+++ b/sql/updates/2.4.3_updates/152_world.sql
diff --git a/sql/updates/153_world.sql b/sql/updates/2.4.3_updates/153_world.sql
index dbff1592850..dbff1592850 100644
--- a/sql/updates/153_world.sql
+++ b/sql/updates/2.4.3_updates/153_world.sql
diff --git a/sql/updates/171_world.sql b/sql/updates/2.4.3_updates/171_world.sql
index fdcd98f4d6e..fdcd98f4d6e 100644
--- a/sql/updates/171_world.sql
+++ b/sql/updates/2.4.3_updates/171_world.sql
diff --git a/sql/updates/172_world_scripts.sql b/sql/updates/2.4.3_updates/172_world_scripts.sql
index 358afe538ed..358afe538ed 100644
--- a/sql/updates/172_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/172_world_scripts.sql
diff --git a/sql/updates/175_world_scripts.sql b/sql/updates/2.4.3_updates/175_world_scripts.sql
index d30601c4c9c..d30601c4c9c 100644
--- a/sql/updates/175_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/175_world_scripts.sql
diff --git a/sql/updates/176_world.sql b/sql/updates/2.4.3_updates/176_world.sql
index 12df2a083ca..12df2a083ca 100644
--- a/sql/updates/176_world.sql
+++ b/sql/updates/2.4.3_updates/176_world.sql
diff --git a/sql/updates/182_world.sql b/sql/updates/2.4.3_updates/182_world.sql
index 450b5394720..450b5394720 100644
--- a/sql/updates/182_world.sql
+++ b/sql/updates/2.4.3_updates/182_world.sql
diff --git a/sql/updates/212_world_scripts.sql b/sql/updates/2.4.3_updates/212_world_scripts.sql
index 1427efde6e3..1427efde6e3 100644
--- a/sql/updates/212_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/212_world_scripts.sql
diff --git a/sql/updates/220_characters.sql b/sql/updates/2.4.3_updates/220_characters.sql
index 1d9e3f50a33..1d9e3f50a33 100644
--- a/sql/updates/220_characters.sql
+++ b/sql/updates/2.4.3_updates/220_characters.sql
diff --git a/sql/updates/230_world.sql b/sql/updates/2.4.3_updates/230_world.sql
index 3f3565e7800..3f3565e7800 100644
--- a/sql/updates/230_world.sql
+++ b/sql/updates/2.4.3_updates/230_world.sql
diff --git a/sql/updates/230_world_blacktemple.sql b/sql/updates/2.4.3_updates/230_world_blacktemple.sql
index 74345a7c51f..74345a7c51f 100644
--- a/sql/updates/230_world_blacktemple.sql
+++ b/sql/updates/2.4.3_updates/230_world_blacktemple.sql
diff --git a/sql/updates/230_world_scripts.sql b/sql/updates/2.4.3_updates/230_world_scripts.sql
index 34d3ee5707f..34d3ee5707f 100644
--- a/sql/updates/230_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/230_world_scripts.sql
diff --git a/sql/updates/230_world_serpent_shrine.sql b/sql/updates/2.4.3_updates/230_world_serpent_shrine.sql
index 0e16bd6de2b..0e16bd6de2b 100644
--- a/sql/updates/230_world_serpent_shrine.sql
+++ b/sql/updates/2.4.3_updates/230_world_serpent_shrine.sql
diff --git a/sql/updates/231_world_scripts.sql b/sql/updates/2.4.3_updates/231_world_scripts.sql
index b07f7b47fef..b07f7b47fef 100644
--- a/sql/updates/231_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/231_world_scripts.sql
diff --git a/sql/updates/233_world.sql b/sql/updates/2.4.3_updates/233_world.sql
index e77d057cae4..e77d057cae4 100644
--- a/sql/updates/233_world.sql
+++ b/sql/updates/2.4.3_updates/233_world.sql
diff --git a/sql/updates/238_world.sql b/sql/updates/2.4.3_updates/238_world.sql
index c1180ca0abd..c1180ca0abd 100644
--- a/sql/updates/238_world.sql
+++ b/sql/updates/2.4.3_updates/238_world.sql
diff --git a/sql/updates/240_world.sql b/sql/updates/2.4.3_updates/240_world.sql
index 9a91607fed0..9a91607fed0 100644
--- a/sql/updates/240_world.sql
+++ b/sql/updates/2.4.3_updates/240_world.sql
diff --git a/sql/updates/241_world.sql b/sql/updates/2.4.3_updates/241_world.sql
index 2bc028b3eba..2bc028b3eba 100644
--- a/sql/updates/241_world.sql
+++ b/sql/updates/2.4.3_updates/241_world.sql
diff --git a/sql/updates/247_world.sql b/sql/updates/2.4.3_updates/247_world.sql
index a47e9733bcf..a47e9733bcf 100644
--- a/sql/updates/247_world.sql
+++ b/sql/updates/2.4.3_updates/247_world.sql
diff --git a/sql/updates/262_characters.sql b/sql/updates/2.4.3_updates/262_characters.sql
index b3caa9704f0..b3caa9704f0 100644
--- a/sql/updates/262_characters.sql
+++ b/sql/updates/2.4.3_updates/262_characters.sql
diff --git a/sql/updates/262_realmd.sql b/sql/updates/2.4.3_updates/262_realmd.sql
index 1953f19fe28..1953f19fe28 100644
--- a/sql/updates/262_realmd.sql
+++ b/sql/updates/2.4.3_updates/262_realmd.sql
diff --git a/sql/updates/262_world.sql b/sql/updates/2.4.3_updates/262_world.sql
index 6c97d9798d5..6c97d9798d5 100644
--- a/sql/updates/262_world.sql
+++ b/sql/updates/2.4.3_updates/262_world.sql
diff --git a/sql/updates/273_world_scripts.sql b/sql/updates/2.4.3_updates/273_world_scripts.sql
index 2979197c734..2979197c734 100644
--- a/sql/updates/273_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/273_world_scripts.sql
diff --git a/sql/updates/285_world.sql b/sql/updates/2.4.3_updates/285_world.sql
index 74825f4b75a..74825f4b75a 100644
--- a/sql/updates/285_world.sql
+++ b/sql/updates/2.4.3_updates/285_world.sql
diff --git a/sql/updates/287_world_scripts.sql b/sql/updates/2.4.3_updates/287_world_scripts.sql
index 4a0c5031188..4a0c5031188 100644
--- a/sql/updates/287_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/287_world_scripts.sql
diff --git a/sql/updates/329_world.sql b/sql/updates/2.4.3_updates/329_world.sql
index 33f61416fb1..33f61416fb1 100644
--- a/sql/updates/329_world.sql
+++ b/sql/updates/2.4.3_updates/329_world.sql
diff --git a/sql/updates/332_world.sql b/sql/updates/2.4.3_updates/332_world.sql
index 912173fcbbf..912173fcbbf 100644
--- a/sql/updates/332_world.sql
+++ b/sql/updates/2.4.3_updates/332_world.sql
diff --git a/sql/updates/333_world.sql b/sql/updates/2.4.3_updates/333_world.sql
index 9bd405e3589..9bd405e3589 100644
--- a/sql/updates/333_world.sql
+++ b/sql/updates/2.4.3_updates/333_world.sql
diff --git a/sql/updates/334_world.sql b/sql/updates/2.4.3_updates/334_world.sql
index 6cd6cb7714a..6cd6cb7714a 100644
--- a/sql/updates/334_world.sql
+++ b/sql/updates/2.4.3_updates/334_world.sql
diff --git a/sql/updates/341_world.sql b/sql/updates/2.4.3_updates/341_world.sql
index 7d1eb4a0c8d..7d1eb4a0c8d 100644
--- a/sql/updates/341_world.sql
+++ b/sql/updates/2.4.3_updates/341_world.sql
diff --git a/sql/updates/356_world.sql b/sql/updates/2.4.3_updates/356_world.sql
index 9db8a85d7cd..9db8a85d7cd 100644
--- a/sql/updates/356_world.sql
+++ b/sql/updates/2.4.3_updates/356_world.sql
diff --git a/sql/updates/373_world_scripts.sql b/sql/updates/2.4.3_updates/373_world_scripts.sql
index db27ebe2441..db27ebe2441 100644
--- a/sql/updates/373_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/373_world_scripts.sql
diff --git a/sql/updates/377_world_scripts.sql b/sql/updates/2.4.3_updates/377_world_scripts.sql
index fe93962ef3a..fe93962ef3a 100644
--- a/sql/updates/377_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/377_world_scripts.sql
diff --git a/sql/updates/389_world.sql b/sql/updates/2.4.3_updates/389_world.sql
index 89094143f64..89094143f64 100644
--- a/sql/updates/389_world.sql
+++ b/sql/updates/2.4.3_updates/389_world.sql
diff --git a/sql/updates/400_world.sql b/sql/updates/2.4.3_updates/400_world.sql
index a2f7d1e6cea..a2f7d1e6cea 100644
--- a/sql/updates/400_world.sql
+++ b/sql/updates/2.4.3_updates/400_world.sql
diff --git a/sql/updates/410_characters.sql b/sql/updates/2.4.3_updates/410_characters.sql
index 483b991e19e..483b991e19e 100644
--- a/sql/updates/410_characters.sql
+++ b/sql/updates/2.4.3_updates/410_characters.sql
diff --git a/sql/updates/426_world_scripts.sql b/sql/updates/2.4.3_updates/426_world_scripts.sql
index fde6ee6dbf2..fde6ee6dbf2 100644
--- a/sql/updates/426_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/426_world_scripts.sql
diff --git a/sql/updates/427_world_scripts.sql b/sql/updates/2.4.3_updates/427_world_scripts.sql
index b6fe5fb7acb..b6fe5fb7acb 100644
--- a/sql/updates/427_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/427_world_scripts.sql
diff --git a/sql/updates/444_world.sql b/sql/updates/2.4.3_updates/444_world.sql
index 004cf626f88..004cf626f88 100644
--- a/sql/updates/444_world.sql
+++ b/sql/updates/2.4.3_updates/444_world.sql
diff --git a/sql/updates/452_world.sql b/sql/updates/2.4.3_updates/452_world.sql
index 3b549278fc7..3b549278fc7 100644
--- a/sql/updates/452_world.sql
+++ b/sql/updates/2.4.3_updates/452_world.sql
diff --git a/sql/updates/455_world.sql b/sql/updates/2.4.3_updates/455_world.sql
index a5a23c5f5d6..a5a23c5f5d6 100644
--- a/sql/updates/455_world.sql
+++ b/sql/updates/2.4.3_updates/455_world.sql
diff --git a/sql/updates/45_characters.sql b/sql/updates/2.4.3_updates/45_characters.sql
index 9f370ba909c..9f370ba909c 100644
--- a/sql/updates/45_characters.sql
+++ b/sql/updates/2.4.3_updates/45_characters.sql
diff --git a/sql/updates/471_world.sql b/sql/updates/2.4.3_updates/471_world.sql
index 2db368326e8..2db368326e8 100644
--- a/sql/updates/471_world.sql
+++ b/sql/updates/2.4.3_updates/471_world.sql
diff --git a/sql/updates/480_world_scripts.sql b/sql/updates/2.4.3_updates/480_world_scripts.sql
index 203196a0f16..203196a0f16 100644
--- a/sql/updates/480_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/480_world_scripts.sql
diff --git a/sql/updates/488_world_scripts.sql b/sql/updates/2.4.3_updates/488_world_scripts.sql
index 41b264fb217..41b264fb217 100644
--- a/sql/updates/488_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/488_world_scripts.sql
diff --git a/sql/updates/502_world_scripts.sql b/sql/updates/2.4.3_updates/502_world_scripts.sql
index 458d8bb24ed..458d8bb24ed 100644
--- a/sql/updates/502_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/502_world_scripts.sql
diff --git a/sql/updates/505_world.sql b/sql/updates/2.4.3_updates/505_world.sql
index fe3b3c850aa..fe3b3c850aa 100644
--- a/sql/updates/505_world.sql
+++ b/sql/updates/2.4.3_updates/505_world.sql
diff --git a/sql/updates/506_world.sql b/sql/updates/2.4.3_updates/506_world.sql
index 069690c4da8..069690c4da8 100644
--- a/sql/updates/506_world.sql
+++ b/sql/updates/2.4.3_updates/506_world.sql
diff --git a/sql/updates/513_world_scripts.sql b/sql/updates/2.4.3_updates/513_world_scripts.sql
index 21a57ea3316..21a57ea3316 100644
--- a/sql/updates/513_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/513_world_scripts.sql
diff --git a/sql/updates/519_world.sql b/sql/updates/2.4.3_updates/519_world.sql
index 2423f94ec1c..2423f94ec1c 100644
--- a/sql/updates/519_world.sql
+++ b/sql/updates/2.4.3_updates/519_world.sql
diff --git a/sql/updates/537_world.sql b/sql/updates/2.4.3_updates/537_world.sql
index 2401a5aeadd..2401a5aeadd 100644
--- a/sql/updates/537_world.sql
+++ b/sql/updates/2.4.3_updates/537_world.sql
diff --git a/sql/updates/541_characters.sql b/sql/updates/2.4.3_updates/541_characters.sql
index 2651c069e05..2651c069e05 100644
--- a/sql/updates/541_characters.sql
+++ b/sql/updates/2.4.3_updates/541_characters.sql
diff --git a/sql/updates/541_world.sql b/sql/updates/2.4.3_updates/541_world.sql
index 7d8e1fc8e1b..7d8e1fc8e1b 100644
--- a/sql/updates/541_world.sql
+++ b/sql/updates/2.4.3_updates/541_world.sql
diff --git a/sql/updates/542_characters.sql b/sql/updates/2.4.3_updates/542_characters.sql
index 4cc3bebea80..4cc3bebea80 100644
--- a/sql/updates/542_characters.sql
+++ b/sql/updates/2.4.3_updates/542_characters.sql
diff --git a/sql/updates/54_world.sql b/sql/updates/2.4.3_updates/54_world.sql
index 88ebc4b46db..88ebc4b46db 100644
--- a/sql/updates/54_world.sql
+++ b/sql/updates/2.4.3_updates/54_world.sql
diff --git a/sql/updates/551_world.sql b/sql/updates/2.4.3_updates/551_world.sql
index 5a01d596ab4..5a01d596ab4 100644
--- a/sql/updates/551_world.sql
+++ b/sql/updates/2.4.3_updates/551_world.sql
diff --git a/sql/updates/566_world.sql b/sql/updates/2.4.3_updates/566_world.sql
index 6c176e1ad89..6c176e1ad89 100644
--- a/sql/updates/566_world.sql
+++ b/sql/updates/2.4.3_updates/566_world.sql
diff --git a/sql/updates/571_world.sql b/sql/updates/2.4.3_updates/571_world.sql
index 115c210306b..115c210306b 100644
--- a/sql/updates/571_world.sql
+++ b/sql/updates/2.4.3_updates/571_world.sql
diff --git a/sql/updates/572_world.sql b/sql/updates/2.4.3_updates/572_world.sql
index 33ce446b012..33ce446b012 100644
--- a/sql/updates/572_world.sql
+++ b/sql/updates/2.4.3_updates/572_world.sql
diff --git a/sql/updates/575_world_scripts.sql b/sql/updates/2.4.3_updates/575_world_scripts.sql
index 85a75215f0e..85a75215f0e 100644
--- a/sql/updates/575_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/575_world_scripts.sql
diff --git a/sql/updates/57_world_scripts.sql b/sql/updates/2.4.3_updates/57_world_scripts.sql
index 2f76ae8c94f..2f76ae8c94f 100644
--- a/sql/updates/57_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/57_world_scripts.sql
diff --git a/sql/updates/583_world_scripts.sql b/sql/updates/2.4.3_updates/583_world_scripts.sql
index 45f8d80a244..45f8d80a244 100644
--- a/sql/updates/583_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/583_world_scripts.sql
diff --git a/sql/updates/586_world_scripts.sql b/sql/updates/2.4.3_updates/586_world_scripts.sql
index a86cec4951b..a86cec4951b 100644
--- a/sql/updates/586_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/586_world_scripts.sql
diff --git a/sql/updates/588_world.sql b/sql/updates/2.4.3_updates/588_world.sql
index e85a034f344..e85a034f344 100644
--- a/sql/updates/588_world.sql
+++ b/sql/updates/2.4.3_updates/588_world.sql
diff --git a/sql/updates/608_world.sql b/sql/updates/2.4.3_updates/608_world.sql
index 5c052ecd078..5c052ecd078 100644
--- a/sql/updates/608_world.sql
+++ b/sql/updates/2.4.3_updates/608_world.sql
diff --git a/sql/updates/615_world.sql b/sql/updates/2.4.3_updates/615_world.sql
index 28512e8511e..28512e8511e 100644
--- a/sql/updates/615_world.sql
+++ b/sql/updates/2.4.3_updates/615_world.sql
diff --git a/sql/updates/636_world_scripts.sql b/sql/updates/2.4.3_updates/636_world_scripts.sql
index 5527d639fb2..5527d639fb2 100644
--- a/sql/updates/636_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/636_world_scripts.sql
diff --git a/sql/updates/640_world.sql b/sql/updates/2.4.3_updates/640_world.sql
index 20253029d5b..20253029d5b 100644
--- a/sql/updates/640_world.sql
+++ b/sql/updates/2.4.3_updates/640_world.sql
diff --git a/sql/updates/645_world_scripts.sql b/sql/updates/2.4.3_updates/645_world_scripts.sql
index f480a97e204..f480a97e204 100644
--- a/sql/updates/645_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/645_world_scripts.sql
diff --git a/sql/updates/667_world_scripts.sql b/sql/updates/2.4.3_updates/667_world_scripts.sql
index 1da0cea44e1..1da0cea44e1 100644
--- a/sql/updates/667_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/667_world_scripts.sql
diff --git a/sql/updates/66_world_scripts.sql b/sql/updates/2.4.3_updates/66_world_scripts.sql
index dfce2afedcc..dfce2afedcc 100644
--- a/sql/updates/66_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/66_world_scripts.sql
diff --git a/sql/updates/676_world.sql b/sql/updates/2.4.3_updates/676_world.sql
index 2b9135c04bd..2b9135c04bd 100644
--- a/sql/updates/676_world.sql
+++ b/sql/updates/2.4.3_updates/676_world.sql
diff --git a/sql/updates/679_world_scripts.sql b/sql/updates/2.4.3_updates/679_world_scripts.sql
index 408eb77b046..408eb77b046 100644
--- a/sql/updates/679_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/679_world_scripts.sql
diff --git a/sql/updates/683_world_scripts.sql b/sql/updates/2.4.3_updates/683_world_scripts.sql
index 13f18008438..13f18008438 100644
--- a/sql/updates/683_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/683_world_scripts.sql
diff --git a/sql/updates/686_world_scripts.sql b/sql/updates/2.4.3_updates/686_world_scripts.sql
index b793036e463..b793036e463 100644
--- a/sql/updates/686_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/686_world_scripts.sql
diff --git a/sql/updates/68_world.sql b/sql/updates/2.4.3_updates/68_world.sql
index 650f4ea3ca0..650f4ea3ca0 100644
--- a/sql/updates/68_world.sql
+++ b/sql/updates/2.4.3_updates/68_world.sql
diff --git a/sql/updates/691_world_scripts.sql b/sql/updates/2.4.3_updates/691_world_scripts.sql
index 922f4b24fab..922f4b24fab 100644
--- a/sql/updates/691_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/691_world_scripts.sql
diff --git a/sql/updates/692_world.sql b/sql/updates/2.4.3_updates/692_world.sql
index 2149baa9488..2149baa9488 100644
--- a/sql/updates/692_world.sql
+++ b/sql/updates/2.4.3_updates/692_world.sql
diff --git a/sql/updates/708_world_scripts.sql b/sql/updates/2.4.3_updates/708_world_scripts.sql
index 5d0d9a9a916..5d0d9a9a916 100644
--- a/sql/updates/708_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/708_world_scripts.sql
diff --git a/sql/updates/70_world_scripts.sql b/sql/updates/2.4.3_updates/70_world_scripts.sql
index 1bbf737c59c..1bbf737c59c 100644
--- a/sql/updates/70_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/70_world_scripts.sql
diff --git a/sql/updates/722_world_script_texts.sql b/sql/updates/2.4.3_updates/722_world_script_texts.sql
index 8be4cd9a86f..8be4cd9a86f 100644
--- a/sql/updates/722_world_script_texts.sql
+++ b/sql/updates/2.4.3_updates/722_world_script_texts.sql
diff --git a/sql/updates/724_world.sql b/sql/updates/2.4.3_updates/724_world.sql
index 6c57f8b4a22..6c57f8b4a22 100644
--- a/sql/updates/724_world.sql
+++ b/sql/updates/2.4.3_updates/724_world.sql
diff --git a/sql/updates/725_characters.sql b/sql/updates/2.4.3_updates/725_characters.sql
index 675c6721602..675c6721602 100644
--- a/sql/updates/725_characters.sql
+++ b/sql/updates/2.4.3_updates/725_characters.sql
diff --git a/sql/updates/725_world.sql b/sql/updates/2.4.3_updates/725_world.sql
index 38eeead03cb..38eeead03cb 100644
--- a/sql/updates/725_world.sql
+++ b/sql/updates/2.4.3_updates/725_world.sql
diff --git a/sql/updates/728_world_scripts.sql b/sql/updates/2.4.3_updates/728_world_scripts.sql
index 8ada5080463..8ada5080463 100644
--- a/sql/updates/728_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/728_world_scripts.sql
diff --git a/sql/updates/733_characters.sql b/sql/updates/2.4.3_updates/733_characters.sql
index 21c3d27e782..21c3d27e782 100644
--- a/sql/updates/733_characters.sql
+++ b/sql/updates/2.4.3_updates/733_characters.sql
diff --git a/sql/updates/739_characters.sql b/sql/updates/2.4.3_updates/739_characters.sql
index 8a4e9197494..8a4e9197494 100644
--- a/sql/updates/739_characters.sql
+++ b/sql/updates/2.4.3_updates/739_characters.sql
diff --git a/sql/updates/741_characters.sql b/sql/updates/2.4.3_updates/741_characters.sql
index 4ce094e3e5f..4ce094e3e5f 100644
--- a/sql/updates/741_characters.sql
+++ b/sql/updates/2.4.3_updates/741_characters.sql
diff --git a/sql/updates/747_world.sql b/sql/updates/2.4.3_updates/747_world.sql
index 0fd9c3552e4..0fd9c3552e4 100644
--- a/sql/updates/747_world.sql
+++ b/sql/updates/2.4.3_updates/747_world.sql
diff --git a/sql/updates/748_world_scripts.sql b/sql/updates/2.4.3_updates/748_world_scripts.sql
index 2c1f692056d..2c1f692056d 100644
--- a/sql/updates/748_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/748_world_scripts.sql
diff --git a/sql/updates/758_world_scripts.sql b/sql/updates/2.4.3_updates/758_world_scripts.sql
index 3e8ca0f38b9..3e8ca0f38b9 100644
--- a/sql/updates/758_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/758_world_scripts.sql
diff --git a/sql/updates/762_world.sql b/sql/updates/2.4.3_updates/762_world.sql
index 6e69f078743..6e69f078743 100644
--- a/sql/updates/762_world.sql
+++ b/sql/updates/2.4.3_updates/762_world.sql
diff --git a/sql/updates/764_world_scripts.sql b/sql/updates/2.4.3_updates/764_world_scripts.sql
index 2a8e7b23b12..2a8e7b23b12 100644
--- a/sql/updates/764_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/764_world_scripts.sql
diff --git a/sql/updates/765_world_scripts.sql b/sql/updates/2.4.3_updates/765_world_scripts.sql
index 1283e75f66c..1283e75f66c 100644
--- a/sql/updates/765_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/765_world_scripts.sql
diff --git a/sql/updates/773_world_scripts.sql b/sql/updates/2.4.3_updates/773_world_scripts.sql
index adfb24e945c..adfb24e945c 100644
--- a/sql/updates/773_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/773_world_scripts.sql
diff --git a/sql/updates/780_characters.sql b/sql/updates/2.4.3_updates/780_characters.sql
index cbcb193c276..cbcb193c276 100644
--- a/sql/updates/780_characters.sql
+++ b/sql/updates/2.4.3_updates/780_characters.sql
diff --git a/sql/updates/783_world.sql b/sql/updates/2.4.3_updates/783_world.sql
index 7076956dd24..7076956dd24 100644
--- a/sql/updates/783_world.sql
+++ b/sql/updates/2.4.3_updates/783_world.sql
diff --git a/sql/updates/785_world.sql b/sql/updates/2.4.3_updates/785_world.sql
index 64ffa36957c..64ffa36957c 100644
--- a/sql/updates/785_world.sql
+++ b/sql/updates/2.4.3_updates/785_world.sql
diff --git a/sql/updates/789_world.sql b/sql/updates/2.4.3_updates/789_world.sql
index 475e16538d1..475e16538d1 100644
--- a/sql/updates/789_world.sql
+++ b/sql/updates/2.4.3_updates/789_world.sql
diff --git a/sql/updates/78_world.sql b/sql/updates/2.4.3_updates/78_world.sql
index faa02e0e2a6..faa02e0e2a6 100644
--- a/sql/updates/78_world.sql
+++ b/sql/updates/2.4.3_updates/78_world.sql
diff --git a/sql/updates/79_characters.sql b/sql/updates/2.4.3_updates/79_characters.sql
index 15b99f2f4b0..15b99f2f4b0 100644
--- a/sql/updates/79_characters.sql
+++ b/sql/updates/2.4.3_updates/79_characters.sql
diff --git a/sql/updates/79_world.sql b/sql/updates/2.4.3_updates/79_world.sql
index 7b08a825311..7b08a825311 100644
--- a/sql/updates/79_world.sql
+++ b/sql/updates/2.4.3_updates/79_world.sql
diff --git a/sql/updates/807_world_scripts.sql b/sql/updates/2.4.3_updates/807_world_scripts.sql
index ee2cbee4fee..ee2cbee4fee 100644
--- a/sql/updates/807_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/807_world_scripts.sql
diff --git a/sql/updates/817_world_scripts.sql b/sql/updates/2.4.3_updates/817_world_scripts.sql
index 8cf97f7145a..8cf97f7145a 100644
--- a/sql/updates/817_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/817_world_scripts.sql
diff --git a/sql/updates/822_world_scripts.sql b/sql/updates/2.4.3_updates/822_world_scripts.sql
index 942971f8d71..942971f8d71 100644
--- a/sql/updates/822_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/822_world_scripts.sql
diff --git a/sql/updates/826_world_scripts.sql b/sql/updates/2.4.3_updates/826_world_scripts.sql
index 487971d092c..487971d092c 100644
--- a/sql/updates/826_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/826_world_scripts.sql
diff --git a/sql/updates/82_world_scripts.sql b/sql/updates/2.4.3_updates/82_world_scripts.sql
index acdfdd06a6f..acdfdd06a6f 100644
--- a/sql/updates/82_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/82_world_scripts.sql
diff --git a/sql/updates/833_world_scripts.sql b/sql/updates/2.4.3_updates/833_world_scripts.sql
index 12ed9ecced5..12ed9ecced5 100644
--- a/sql/updates/833_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/833_world_scripts.sql
diff --git a/sql/updates/834_world_scripts.sql b/sql/updates/2.4.3_updates/834_world_scripts.sql
index 14b3d74340e..14b3d74340e 100644
--- a/sql/updates/834_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/834_world_scripts.sql
diff --git a/sql/updates/837_world_scripts.sql b/sql/updates/2.4.3_updates/837_world_scripts.sql
index 5fc2abfc4df..5fc2abfc4df 100644
--- a/sql/updates/837_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/837_world_scripts.sql
diff --git a/sql/updates/838_world_scripts.sql b/sql/updates/2.4.3_updates/838_world_scripts.sql
index 6b93a03afa0..6b93a03afa0 100644
--- a/sql/updates/838_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/838_world_scripts.sql
diff --git a/sql/updates/839_world_scripts.sql b/sql/updates/2.4.3_updates/839_world_scripts.sql
index 7b4ef66ba92..7b4ef66ba92 100644
--- a/sql/updates/839_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/839_world_scripts.sql
diff --git a/sql/updates/83_realmd.sql b/sql/updates/2.4.3_updates/83_realmd.sql
index e3c74350735..e3c74350735 100644
--- a/sql/updates/83_realmd.sql
+++ b/sql/updates/2.4.3_updates/83_realmd.sql
diff --git a/sql/updates/840_world_scripts.sql b/sql/updates/2.4.3_updates/840_world_scripts.sql
index cfa3d492b9a..cfa3d492b9a 100644
--- a/sql/updates/840_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/840_world_scripts.sql
diff --git a/sql/updates/841_world_scripts.sql b/sql/updates/2.4.3_updates/841_world_scripts.sql
index 86d73ba2019..86d73ba2019 100644
--- a/sql/updates/841_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/841_world_scripts.sql
diff --git a/sql/updates/842_world.sql b/sql/updates/2.4.3_updates/842_world.sql
index cf017877b5e..cf017877b5e 100644
--- a/sql/updates/842_world.sql
+++ b/sql/updates/2.4.3_updates/842_world.sql
diff --git a/sql/updates/84_world.sql b/sql/updates/2.4.3_updates/84_world.sql
index 100185c0acd..100185c0acd 100644
--- a/sql/updates/84_world.sql
+++ b/sql/updates/2.4.3_updates/84_world.sql
diff --git a/sql/updates/850_world_scripts.sql b/sql/updates/2.4.3_updates/850_world_scripts.sql
index 3027947cf14..3027947cf14 100644
--- a/sql/updates/850_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/850_world_scripts.sql
diff --git a/sql/updates/852_world_scripts.sql b/sql/updates/2.4.3_updates/852_world_scripts.sql
index 001b43c8820..001b43c8820 100644
--- a/sql/updates/852_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/852_world_scripts.sql
diff --git a/sql/updates/857_world_scripts.sql b/sql/updates/2.4.3_updates/857_world_scripts.sql
index acd712aecb9..acd712aecb9 100644
--- a/sql/updates/857_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/857_world_scripts.sql
diff --git a/sql/updates/863_world_scripts.sql b/sql/updates/2.4.3_updates/863_world_scripts.sql
index a7a214b8956..a7a214b8956 100644
--- a/sql/updates/863_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/863_world_scripts.sql
diff --git a/sql/updates/86_world_scripts.sql b/sql/updates/2.4.3_updates/86_world_scripts.sql
index 8f3c6ac6265..8f3c6ac6265 100644
--- a/sql/updates/86_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/86_world_scripts.sql
diff --git a/sql/updates/871_world.sql b/sql/updates/2.4.3_updates/871_world.sql
index 114cd3101b7..114cd3101b7 100644
--- a/sql/updates/871_world.sql
+++ b/sql/updates/2.4.3_updates/871_world.sql
diff --git a/sql/updates/884_world.sql b/sql/updates/2.4.3_updates/884_world.sql
index 9924bf86f61..9924bf86f61 100644
--- a/sql/updates/884_world.sql
+++ b/sql/updates/2.4.3_updates/884_world.sql
diff --git a/sql/updates/905_world_scripts.sql b/sql/updates/2.4.3_updates/905_world_scripts.sql
index 3e59e1f0e52..3e59e1f0e52 100644
--- a/sql/updates/905_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/905_world_scripts.sql
diff --git a/sql/updates/90_world.sql b/sql/updates/2.4.3_updates/90_world.sql
index 52ca028b6ac..52ca028b6ac 100644
--- a/sql/updates/90_world.sql
+++ b/sql/updates/2.4.3_updates/90_world.sql
diff --git a/sql/updates/917_world.sql b/sql/updates/2.4.3_updates/917_world.sql
index 7c989ce7ca4..7c989ce7ca4 100644
--- a/sql/updates/917_world.sql
+++ b/sql/updates/2.4.3_updates/917_world.sql
diff --git a/sql/updates/919_world.sql b/sql/updates/2.4.3_updates/919_world.sql
index 4d4a6308576..4d4a6308576 100644
--- a/sql/updates/919_world.sql
+++ b/sql/updates/2.4.3_updates/919_world.sql
diff --git a/sql/updates/927_characters.sql b/sql/updates/2.4.3_updates/927_characters.sql
index 6cbcf21e7bd..6cbcf21e7bd 100644
--- a/sql/updates/927_characters.sql
+++ b/sql/updates/2.4.3_updates/927_characters.sql
diff --git a/sql/updates/930_characters.sql b/sql/updates/2.4.3_updates/930_characters.sql
index cc215786bb1..cc215786bb1 100644
--- a/sql/updates/930_characters.sql
+++ b/sql/updates/2.4.3_updates/930_characters.sql
diff --git a/sql/updates/933_world_scripts.sql b/sql/updates/2.4.3_updates/933_world_scripts.sql
index 1a3e9d96f56..1a3e9d96f56 100644
--- a/sql/updates/933_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/933_world_scripts.sql
diff --git a/sql/updates/935_world_scripts.sql b/sql/updates/2.4.3_updates/935_world_scripts.sql
index 934d3a7de23..934d3a7de23 100644
--- a/sql/updates/935_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/935_world_scripts.sql
diff --git a/sql/updates/940_world_scripts.sql b/sql/updates/2.4.3_updates/940_world_scripts.sql
index c7f378c6360..c7f378c6360 100644
--- a/sql/updates/940_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/940_world_scripts.sql
diff --git a/sql/updates/945_world_scripts.sql b/sql/updates/2.4.3_updates/945_world_scripts.sql
index a96e7cc1a68..a96e7cc1a68 100644
--- a/sql/updates/945_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/945_world_scripts.sql
diff --git a/sql/updates/947_world_scripts.sql b/sql/updates/2.4.3_updates/947_world_scripts.sql
index a62e3a24455..a62e3a24455 100644
--- a/sql/updates/947_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/947_world_scripts.sql
diff --git a/sql/updates/948_world_scripts.sql b/sql/updates/2.4.3_updates/948_world_scripts.sql
index 4828323f7e6..4828323f7e6 100644
--- a/sql/updates/948_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/948_world_scripts.sql
diff --git a/sql/updates/950_world_scripts.sql b/sql/updates/2.4.3_updates/950_world_scripts.sql
index df7fda62a4d..df7fda62a4d 100644
--- a/sql/updates/950_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/950_world_scripts.sql
diff --git a/sql/updates/951_world_scripts.sql b/sql/updates/2.4.3_updates/951_world_scripts.sql
index c0d7a80d58c..c0d7a80d58c 100644
--- a/sql/updates/951_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/951_world_scripts.sql
diff --git a/sql/updates/952_world_scripts.sql b/sql/updates/2.4.3_updates/952_world_scripts.sql
index b252050d981..b252050d981 100644
--- a/sql/updates/952_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/952_world_scripts.sql
diff --git a/sql/updates/953_world_scripts.sql b/sql/updates/2.4.3_updates/953_world_scripts.sql
index 3f0f46fd8e3..3f0f46fd8e3 100644
--- a/sql/updates/953_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/953_world_scripts.sql
diff --git a/sql/updates/954_world_scripts.sql b/sql/updates/2.4.3_updates/954_world_scripts.sql
index 70a5a377dbd..70a5a377dbd 100644
--- a/sql/updates/954_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/954_world_scripts.sql
diff --git a/sql/updates/955_world_scripts.sql b/sql/updates/2.4.3_updates/955_world_scripts.sql
index 5978a4786ad..5978a4786ad 100644
--- a/sql/updates/955_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/955_world_scripts.sql
diff --git a/sql/updates/956_world_scripts.sql b/sql/updates/2.4.3_updates/956_world_scripts.sql
index 8ac06a7ab97..8ac06a7ab97 100644
--- a/sql/updates/956_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/956_world_scripts.sql
diff --git a/sql/updates/957_world_scripts.sql b/sql/updates/2.4.3_updates/957_world_scripts.sql
index 368bd1f5573..368bd1f5573 100644
--- a/sql/updates/957_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/957_world_scripts.sql
diff --git a/sql/updates/963_world_scripts.sql b/sql/updates/2.4.3_updates/963_world_scripts.sql
index 9083b243064..9083b243064 100644
--- a/sql/updates/963_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/963_world_scripts.sql
diff --git a/sql/updates/965_world_scripts.sql b/sql/updates/2.4.3_updates/965_world_scripts.sql
index e3160223d5a..e3160223d5a 100644
--- a/sql/updates/965_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/965_world_scripts.sql
diff --git a/sql/updates/966_world_scripts.sql b/sql/updates/2.4.3_updates/966_world_scripts.sql
index f49411890f4..f49411890f4 100644
--- a/sql/updates/966_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/966_world_scripts.sql
diff --git a/sql/updates/970_world_scripts.sql b/sql/updates/2.4.3_updates/970_world_scripts.sql
index 5a9223cfc78..5a9223cfc78 100644
--- a/sql/updates/970_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/970_world_scripts.sql
diff --git a/sql/updates/973_world_scripts.sql b/sql/updates/2.4.3_updates/973_world_scripts.sql
index ea997f917ff..ea997f917ff 100644
--- a/sql/updates/973_world_scripts.sql
+++ b/sql/updates/2.4.3_updates/973_world_scripts.sql
diff --git a/sql/updates/7059_02_characters_pet_spell.sql b/sql/updates/7059_02_characters_pet_spell.sql
deleted file mode 100644
index e2ee87b9f1f..00000000000
--- a/sql/updates/7059_02_characters_pet_spell.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE character_db_version CHANGE COLUMN required_7059_01_characters_character_spell required_7059_02_characters_pet_spell bit;
-
-ALTER TABLE pet_spell
-    DROP slot;
diff --git a/sql/updates/7113_01_characters_character_achievement_progress.sql b/sql/updates/7113_01_characters_character_achievement_progress.sql
deleted file mode 100644
index 6e38cd9981f..00000000000
--- a/sql/updates/7113_01_characters_character_achievement_progress.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE character_db_version CHANGE COLUMN required_7100_01_characters_character_spell required_7113_01_characters_character_achievement_progress bit;
-
-DELETE FROM character_achievement_progress WHERE counter=0;
diff --git a/sql/updates/7147_01_mangos_creature_template.sql b/sql/updates/7147_01_mangos_creature_template.sql
deleted file mode 100644
index 286718b8edb..00000000000
--- a/sql/updates/7147_01_mangos_creature_template.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE db_version CHANGE COLUMN required_7141_01_mangos_instance_template required_7147_01_mangos_creature_template bit;
-
-UPDATE creature_template
-  SET family = 0 WHERE entry = 1;
diff --git a/sql/updates/7149_01_mangos_spell_proc_event.sql b/sql/updates/7149_01_mangos_spell_proc_event.sql
deleted file mode 100644
index 1dcaf8e5e3d..00000000000
--- a/sql/updates/7149_01_mangos_spell_proc_event.sql
+++ /dev/null
@@ -1,21 +0,0 @@
-ALTER TABLE db_version CHANGE COLUMN required_7147_01_mangos_creature_template required_7149_01_mangos_spell_proc_event bit;
-
--- (53501) Sheath of Light (Rank 1)
-DELETE FROM `spell_proc_event` WHERE `entry` IN (53501);
-INSERT INTO `spell_proc_event` VALUES (53501, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0);
-
--- (53502) Sheath of Light (Rank 2)
-DELETE FROM `spell_proc_event` WHERE `entry` IN (53502);
-INSERT INTO `spell_proc_event` VALUES (53502, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0);
-
--- (53503) Sheath of Light (Rank 3)
-DELETE FROM `spell_proc_event` WHERE `entry` IN (53503);
-INSERT INTO `spell_proc_event` VALUES (53503, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0);
-
--- (53228) Rapid Recuperation (Rank 1)
-DELETE FROM `spell_proc_event` WHERE `entry` IN (53228);
-INSERT INTO `spell_proc_event` VALUES (53228, 0x00, 9, 0x00000020, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);
-
--- (53232) Rapid Recuperation (Rank 2)
-DELETE FROM `spell_proc_event` WHERE `entry` IN (53232);
-INSERT INTO `spell_proc_event` VALUES (53232, 0x00, 9, 0x00000020, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);
diff --git a/sql/updates/7193_01_mangos_mangos_string.sql b/sql/updates/7193_01_mangos_mangos_string.sql
deleted file mode 100644
index bcd05f52ad5..00000000000
--- a/sql/updates/7193_01_mangos_mangos_string.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-ALTER TABLE db_version CHANGE COLUMN required_7175_01_mangos_spell_proc_event required_7193_01_mangos_mangos_string bit;
-
-UPDATE mangos_string SET content_default = 'Unit Flags: %u.\nDynamic Flags: %u.\nFaction Template: %u.' WHERE entry = 542;
-\ No newline at end of file
diff --git a/sql/updates/7196_01_mangos_spell_chain.sql b/sql/updates/7196_01_mangos_spell_chain.sql
deleted file mode 100644
index c7ab0569229..00000000000
--- a/sql/updates/7196_01_mangos_spell_chain.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-ALTER TABLE db_version CHANGE COLUMN required_7193_01_mangos_mangos_string required_7196_01_mangos_spell_chain bit;
-
-INSERT INTO spell_chain VALUES
-/*Tranquility*/
-(44203,    0,44203,1,0),
-(44205,44203,44203,2,0),
-(44206,44205,44203,3,0),
-(44207,44206,44203,4,0),
-(44208,44207,44203,5,0),
-(48444,44208,44203,6,0),
-(48445,48444,44203,7,0),
-
-/*Hurricane*/
-(42231,    0,42231,1,0),
-(42232,42231,42231,2,0),
-(42233,42232,42231,3,0),
-(42230,42233,42231,4,0),
-(48466,42230,42231,5,0);
-\ No newline at end of file
diff --git a/sql/updates/7207_01_mangos_creature.sql b/sql/updates/7207_01_mangos_creature.sql
deleted file mode 100644
index 4145e70e2e8..00000000000
--- a/sql/updates/7207_01_mangos_creature.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE db_version CHANGE COLUMN required_7205_01_mangos_spell_chain required_7207_01_mangos_creature bit;
-
-ALTER TABLE creature
-  ADD COLUMN `phaseMask` smallint(5) unsigned NOT NULL default '1' AFTER `spawnMask`;
diff --git a/sql/updates/7207_02_mangos_gameobject.sql b/sql/updates/7207_02_mangos_gameobject.sql
deleted file mode 100644
index ecd53bb810e..00000000000
--- a/sql/updates/7207_02_mangos_gameobject.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE db_version CHANGE COLUMN required_7207_01_mangos_creature required_7207_02_mangos_gameobject bit;
-
-ALTER TABLE gameobject
-  ADD COLUMN `phaseMask` smallint(5) unsigned NOT NULL default '1' AFTER `spawnMask`;
diff --git a/sql/updates/7207_03_characters_corpse.sql b/sql/updates/7207_03_characters_corpse.sql
deleted file mode 100644
index b53c15e9038..00000000000
--- a/sql/updates/7207_03_characters_corpse.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE character_db_version CHANGE COLUMN required_7198_01_characters_characters required_7207_03_characters_corpse bit;
-
-ALTER TABLE corpse
-  ADD COLUMN `phaseMask` smallint(5) unsigned NOT NULL default '1' AFTER `map`;
diff --git a/sql/updates/7047_01_characters_character_spell.sql b/sql/updates/875_(mangos_7047)_01_characters_character_spell.sql
index a0f3abc8deb..71c7ee79e3b 100644
--- a/sql/updates/7047_01_characters_character_spell.sql
+++ b/sql/updates/875_(mangos_7047)_01_characters_character_spell.sql
@@ -1,11 +1,10 @@
-ALTER TABLE character_db_version CHANGE COLUMN required_6976_02_characters_character_db_version required_7047_01_characters_character_spell bit;
+/*ALTER TABLE character_db_version CHANGE COLUMN required_6976_02_characters_character_db_version required_7047_01_characters_character_spell bit;*/
 
 DELETE FROM `character_spell` WHERE `spell` IN ('28880', 59542, 59543, 59544, 59545, 59547, 59548);
-
 INSERT INTO character_spell SELECT characters.guid as guid, 28880, 4294967295, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 1;
 INSERT INTO character_spell SELECT characters.guid as guid, 59542, 4294967295, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 2;
 INSERT INTO character_spell SELECT characters.guid as guid, 59543, 4294967295, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 3;
 INSERT INTO character_spell SELECT characters.guid as guid, 59544, 4294967295, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 5;
 INSERT INTO character_spell SELECT characters.guid as guid, 59545, 4294967295, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 6;
 INSERT INTO character_spell SELECT characters.guid as guid, 59547, 4294967295, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 7;
-INSERT INTO character_spell SELECT characters.guid as guid, 59548, 4294967295, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 8;
+INSERT INTO character_spell SELECT characters.guid as guid, 59548, 4294967295, 1, 0  FROM `characters` WHERE characters.race=11 AND characters.class = 8;
+\ No newline at end of file
diff --git a/sql/updates/875_(mangos_7059)_01_characters_pet_spell.sql b/sql/updates/875_(mangos_7059)_01_characters_pet_spell.sql
new file mode 100644
index 00000000000..11f1063ebc3
--- /dev/null
+++ b/sql/updates/875_(mangos_7059)_01_characters_pet_spell.sql
@@ -0,0 +1,4 @@
+/*ALTER TABLE character_db_version CHANGE COLUMN required_7059_01_characters_character_spell required_7059_02_characters_pet_spell bit;*/
+
+ALTER TABLE pet_spell
+    DROP slot;
+\ No newline at end of file