Merge branch 'master' of github.com:joschiwald/TrinityCore into spellscripts

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Spells/spell_paladin.cpp

296 files changed, 1630 insertions, 23 deletions

diff --git a/sql/updates/world/2012_02_13_00_world_version.sql b/sql/old/3.3.5a/2012_02_13_00_world_version.sql
index 2dd7ab92ddb..2dd7ab92ddb 100644
--- a/sql/updates/world/2012_02_13_00_world_version.sql
+++ b/sql/old/3.3.5a/2012_02_13_00_world_version.sql
diff --git a/sql/updates/world/2012_02_14_00_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_02_14_00_world_achievement_criteria_data.sql
index 4361f33cf38..e7993726132 100644
--- a/sql/updates/world/2012_02_14_00_world_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2012_02_14_00_world_achievement_criteria_data.sql
@@ -4,4 +4,4 @@ INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,
 (13013, 12, 1, 0, ""), -- heroic
 (13012, 12, 1, 0, ""), -- heroic
 (13011, 12, 0, 0, ""), -- normal
-(12780, 12, 0, 0, ""); -- normal
\ No newline at end of file
+(12780, 12, 0, 0, ""); -- normal
diff --git a/sql/updates/world/2012_02_15_00_world_quest_template.sql b/sql/old/3.3.5a/2012_02_15_00_world_quest_template.sql
index e26f52fd0fe..e26f52fd0fe 100644
--- a/sql/updates/world/2012_02_15_00_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_02_15_00_world_quest_template.sql
diff --git a/sql/updates/world/2012_02_15_01_world_areatrigger_tavern.sql b/sql/old/3.3.5a/2012_02_15_01_world_areatrigger_tavern.sql
index 1c3d45dc490..1c3d45dc490 100644
--- a/sql/updates/world/2012_02_15_01_world_areatrigger_tavern.sql
+++ b/sql/old/3.3.5a/2012_02_15_01_world_areatrigger_tavern.sql
diff --git a/sql/updates/world/2012_02_15_02_world_item_template.sql b/sql/old/3.3.5a/2012_02_15_02_world_item_template.sql
index 463d43368cd..463d43368cd 100644
--- a/sql/updates/world/2012_02_15_02_world_item_template.sql
+++ b/sql/old/3.3.5a/2012_02_15_02_world_item_template.sql
diff --git a/sql/updates/world/2012_02_15_03_world_quest_template.sql b/sql/old/3.3.5a/2012_02_15_03_world_quest_template.sql
index 833d36b246c..833d36b246c 100644
--- a/sql/updates/world/2012_02_15_03_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_02_15_03_world_quest_template.sql
diff --git a/sql/updates/world/2012_02_15_04_world_quest_template.sql b/sql/old/3.3.5a/2012_02_15_04_world_quest_template.sql
index 8b6ad1d2cf9..8b6ad1d2cf9 100644
--- a/sql/updates/world/2012_02_15_04_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_02_15_04_world_quest_template.sql
diff --git a/sql/updates/world/2012_02_15_06_world_creature_involvedrelation.sql b/sql/old/3.3.5a/2012_02_15_06_world_creature_involvedrelation.sql
index 431e23b53b8..431e23b53b8 100644
--- a/sql/updates/world/2012_02_15_06_world_creature_involvedrelation.sql
+++ b/sql/old/3.3.5a/2012_02_15_06_world_creature_involvedrelation.sql
diff --git a/sql/updates/world/2012_02_15_07_00_world_creature.sql b/sql/old/3.3.5a/2012_02_15_07_00_world_creature.sql
index 75beec97d67..75beec97d67 100644
--- a/sql/updates/world/2012_02_15_07_00_world_creature.sql
+++ b/sql/old/3.3.5a/2012_02_15_07_00_world_creature.sql
diff --git a/sql/updates/world/2012_02_15_07_01_world_waypoint_data.sql b/sql/old/3.3.5a/2012_02_15_07_01_world_waypoint_data.sql
index e47572b2074..e47572b2074 100644
--- a/sql/updates/world/2012_02_15_07_01_world_waypoint_data.sql
+++ b/sql/old/3.3.5a/2012_02_15_07_01_world_waypoint_data.sql
diff --git a/sql/updates/world/2012_02_15_07_02_world_misc.sql b/sql/old/3.3.5a/2012_02_15_07_02_world_misc.sql
index e7ffe54e922..e7ffe54e922 100644
--- a/sql/updates/world/2012_02_15_07_02_world_misc.sql
+++ b/sql/old/3.3.5a/2012_02_15_07_02_world_misc.sql
diff --git a/sql/updates/world/2012_02_15_08_world_sai.sql b/sql/old/3.3.5a/2012_02_15_08_world_sai.sql
index ef49ff484f3..ef49ff484f3 100644
--- a/sql/updates/world/2012_02_15_08_world_sai.sql
+++ b/sql/old/3.3.5a/2012_02_15_08_world_sai.sql
diff --git a/sql/updates/world/2012_02_15_09_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_02_15_09_world_spell_proc_event.sql
index 4811e5d66fe..4811e5d66fe 100644
--- a/sql/updates/world/2012_02_15_09_world_spell_proc_event.sql
+++ b/sql/old/3.3.5a/2012_02_15_09_world_spell_proc_event.sql
diff --git a/sql/updates/world/2012_02_16_00_world_conditions.sql b/sql/old/3.3.5a/2012_02_16_00_world_conditions.sql
index a01792ef838..5bef38fc485 100644
--- a/sql/updates/world/2012_02_16_00_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_02_16_00_world_conditions.sql
@@ -4,8 +4,8 @@ CREATE TABLE `temp_convert_spells`
 	PRIMARY KEY (`id`)
 );
 
-# spells with EffectImplicitTarget In (6,21, 25) + spells having Targets & 1115534
-# those spells are the ones which require explicit unit target to cast
+-- spells with EffectImplicitTarget In (6,21, 25) + spells having Targets & 1115534
+-- those spells are the ones which require explicit unit target to cast
 INSERT INTO `temp_convert_spells` VALUES
 (5),
 (11),
@@ -12783,13 +12783,13 @@ INSERT IGNORE INTO `temp_item_spell` SELECT `entry`, `spellid_5` FROM `item_temp
 INSERT INTO `temp_cond_vals` (`spellId`, `entry`, `dead`, `errorTextId`, `comment`) SELECT DISTINCT (SELECT `spellId` FROM `temp_item_spell` WHERE `itemId` = `SourceEntry`), `ConditionValue2`, (`ConditionValue1` - 1), `ErrorTextId`, `Comment` FROM `conditions`
 WHERE `SourceTypeOrReferenceId` = 18;
 
-#use CONDITION_OBJECT_ENTRY instead of CONDITION_ITEM_TARGET
+-- use CONDITION_OBJECT_ENTRY instead of CONDITION_ITEM_TARGET
 INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `Comment`)
 SELECT DISTINCT 17, 0, `spellId`, 0, `elseGroup` - 1, 31, 1, 3, `entry`, 0, 0, `errorTextId`, `comment` FROM `temp_cond_vals`;
-#for CONDITION_ITEM_TARGET with ConditionValue1 = DEAD we're adding !CONDITION_ALIVE as a second requirement
+-- for CONDITION_ITEM_TARGET with ConditionValue1 = DEAD we're adding !CONDITION_ALIVE as a second requirement
 INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `Comment`)
 SELECT DISTINCT 17, 0, `spellId`, 0, `elseGroup` - 1, 36, 1, 0, 0, 0, 1, `errorTextId`, `comment` FROM `temp_cond_vals` WHERE `dead`;
-#remove entries which could be converted by this sql
+-- remove entries which could be converted by this sql
 DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 18 AND `SourceEntry` IN (SELECT `itemId` FROM `temp_item_spell`);
 DROP TABLE `temp_convert_spells`;
 DROP TABLE `temp_cond_vals`;
diff --git a/sql/updates/world/2012_02_16_01_world_conditions.sql b/sql/old/3.3.5a/2012_02_16_01_world_conditions.sql
index 4bcf997b8e4..4bcf997b8e4 100644
--- a/sql/updates/world/2012_02_16_01_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_02_16_01_world_conditions.sql
diff --git a/sql/updates/world/2012_02_17_00_world_waypoints.sql b/sql/old/3.3.5a/2012_02_17_00_world_waypoints.sql
index 1cff86f5d51..1cff86f5d51 100644
--- a/sql/updates/world/2012_02_17_00_world_waypoints.sql
+++ b/sql/old/3.3.5a/2012_02_17_00_world_waypoints.sql
diff --git a/sql/updates/world/2012_02_18_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_02_18_00_world_spell_script_names.sql
index 993fe3a2f38..993fe3a2f38 100644
--- a/sql/updates/world/2012_02_18_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_02_18_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_02_18_01_world_spell_dbc.sql b/sql/old/3.3.5a/2012_02_18_01_world_spell_dbc.sql
index b343399d7f2..b343399d7f2 100644
--- a/sql/updates/world/2012_02_18_01_world_spell_dbc.sql
+++ b/sql/old/3.3.5a/2012_02_18_01_world_spell_dbc.sql
diff --git a/sql/updates/world/2012_02_18_02_world_gossip.sql b/sql/old/3.3.5a/2012_02_18_02_world_gossip.sql
index c72532e3f21..47882d4eb36 100644
--- a/sql/updates/world/2012_02_18_02_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_02_18_02_world_gossip.sql
@@ -49,4 +49,4 @@ INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`
 (573,0,0,'These dwarves are the same ones today, yes?  Do dwarves maintain any other links to the Earthen?',1,1,574,0,0,0,''),
 (574,0,0,'Who are the Creators?',1,1,575,0,0,0,''),
 (575,0,0,'This is a lot to think about.',1,1,576,0,0,0,''),
-(576,0,0,'I will access the discs now.',1,1,0,0,0,0,'');
\ No newline at end of file
+(576,0,0,'I will access the discs now.',1,1,0,0,0,0,'');
diff --git a/sql/updates/world/2012_02_18_03_world_gossip.sql b/sql/old/3.3.5a/2012_02_18_03_world_gossip.sql
index 990006f5098..990006f5098 100644
--- a/sql/updates/world/2012_02_18_03_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_02_18_03_world_gossip.sql
diff --git a/sql/updates/world/2012_02_18_04_world_spell_script_names.sql b/sql/old/3.3.5a/2012_02_18_04_world_spell_script_names.sql
index 8fa5bc55197..8fa5bc55197 100644
--- a/sql/updates/world/2012_02_18_04_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_02_18_04_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_02_18_05_world_creatures.sql b/sql/old/3.3.5a/2012_02_18_05_world_creatures.sql
index 3fdac99c854..3fdac99c854 100644
--- a/sql/updates/world/2012_02_18_05_world_creatures.sql
+++ b/sql/old/3.3.5a/2012_02_18_05_world_creatures.sql
diff --git a/sql/updates/world/2012_02_18_06_world_gossip.sql b/sql/old/3.3.5a/2012_02_18_06_world_gossip.sql
index e3385ceb5b0..e3385ceb5b0 100644
--- a/sql/updates/world/2012_02_18_06_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_02_18_06_world_gossip.sql
diff --git a/sql/updates/world/2012_02_18_07_world_gossip.sql b/sql/old/3.3.5a/2012_02_18_07_world_gossip.sql
index 6246f12cefc..6246f12cefc 100644
--- a/sql/updates/world/2012_02_18_07_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_02_18_07_world_gossip.sql
diff --git a/sql/updates/world/2012_02_18_08_world_gossip.sql b/sql/old/3.3.5a/2012_02_18_08_world_gossip.sql
index a9fef9bcd76..a9fef9bcd76 100644
--- a/sql/updates/world/2012_02_18_08_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_02_18_08_world_gossip.sql
diff --git a/sql/updates/auth/2012_02_19_00_auth_account.sql b/sql/old/3.3.5a/2012_02_19_00_auth_account.sql
index a5b48ede3b4..a5b48ede3b4 100644
--- a/sql/updates/auth/2012_02_19_00_auth_account.sql
+++ b/sql/old/3.3.5a/2012_02_19_00_auth_account.sql
diff --git a/sql/updates/characters/2012_02_19_00_characters_warden_action.sql b/sql/old/3.3.5a/2012_02_19_00_characters_warden_action.sql
index 587f65fedc5..587f65fedc5 100644
--- a/sql/updates/characters/2012_02_19_00_characters_warden_action.sql
+++ b/sql/old/3.3.5a/2012_02_19_00_characters_warden_action.sql
diff --git a/sql/updates/world/2012_02_19_00_world_quest_template.sql b/sql/old/3.3.5a/2012_02_19_00_world_quest_template.sql
index 76ab51f803b..76ab51f803b 100644
--- a/sql/updates/world/2012_02_19_00_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_02_19_00_world_quest_template.sql
diff --git a/sql/updates/world/2012_02_19_01_world_quest_template.sql b/sql/old/3.3.5a/2012_02_19_01_world_quest_template.sql
index 2f888f08cdd..2f888f08cdd 100644
--- a/sql/updates/world/2012_02_19_01_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_02_19_01_world_quest_template.sql
diff --git a/sql/updates/world/2012_02_19_02_world_gameobject.sql b/sql/old/3.3.5a/2012_02_19_02_world_gameobject.sql
index 88a1f2e3a4c..88a1f2e3a4c 100644
--- a/sql/updates/world/2012_02_19_02_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_02_19_02_world_gameobject.sql
diff --git a/sql/updates/world/2012_02_19_03_world_warden_checks.sql b/sql/old/3.3.5a/2012_02_19_03_world_warden_checks.sql
index 3698c461358..3698c461358 100644
--- a/sql/updates/world/2012_02_19_03_world_warden_checks.sql
+++ b/sql/old/3.3.5a/2012_02_19_03_world_warden_checks.sql
diff --git a/sql/updates/world/2012_02_19_04_world_misc_db_updates.sql b/sql/old/3.3.5a/2012_02_19_04_world_misc_db_updates.sql
index 32fada1e895..32fada1e895 100644
--- a/sql/updates/world/2012_02_19_04_world_misc_db_updates.sql
+++ b/sql/old/3.3.5a/2012_02_19_04_world_misc_db_updates.sql
diff --git a/sql/updates/world/2012_02_19_05_world_creature_text.sql b/sql/old/3.3.5a/2012_02_19_05_world_creature_text.sql
index b70385660a1..b70385660a1 100644
--- a/sql/updates/world/2012_02_19_05_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_02_19_05_world_creature_text.sql
diff --git a/sql/updates/world/2012_02_19_06_world_creature_text.sql b/sql/old/3.3.5a/2012_02_19_06_world_creature_text.sql
index f69c4cb86a9..f69c4cb86a9 100644
--- a/sql/updates/world/2012_02_19_06_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_02_19_06_world_creature_text.sql
diff --git a/sql/updates/world/2012_02_20_00_world_sai.sql b/sql/old/3.3.5a/2012_02_20_00_world_sai.sql
index 44f8ab68d70..44f8ab68d70 100644
--- a/sql/updates/world/2012_02_20_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_02_20_00_world_sai.sql
diff --git a/sql/updates/world/2012_02_20_01_world_gossip.sql b/sql/old/3.3.5a/2012_02_20_01_world_gossip.sql
index f3943ded29a..f3943ded29a 100644
--- a/sql/updates/world/2012_02_20_01_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_02_20_01_world_gossip.sql
diff --git a/sql/updates/world/2012_02_20_02_world_conditons.sql b/sql/old/3.3.5a/2012_02_20_02_world_conditons.sql
index 832d8dbdae5..f87a95fb1c9 100644
--- a/sql/updates/world/2012_02_20_02_world_conditons.sql
+++ b/sql/old/3.3.5a/2012_02_20_02_world_conditons.sql
@@ -1,9 +1,10 @@
-# Update a typo in original data entry
+-- Update a typo in original data entry
 UPDATE `npc_spellclick_spells` SET `quest_end`=11999 WHERE `npc_entry`=26477 AND `spell_id`=61832 AND `quest_start`=11999;
-# Delete redundant data with invalid condition type
+
+-- Delete redundant data with invalid condition type
 DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18;
 
-# Static Data
+-- Static Data
 INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,
 `ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`Comment`) VALUES
 (18,24752,44363,0,8,0,11460,0,0,1,'Forbidden rewarded quest for spellclick'),
@@ -167,9 +168,10 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,
 (18,40176,74905,0,8,0,25444,0,0,1,'Forbidden rewarded quest for spellclick'),
 (18,40176,74905,0,9,0,25444,0,0,0,'Required quest active for spellclick');
 
-# Below is a procedure to dynamically convert custom content to conditions table.
-# However this procedure only works for MySQL server versions >= 5.6 due to 
-# a bug / missing feature in older MySQL versions.
+-- Below is a procedure to dynamically convert custom content to conditions table.
+-- However this procedure only works for MySQL server versions >= 5.6 due to 
+-- a bug / missing feature in older MySQL versions.
+
 /*
 
 DROP PROCEDURE IF EXISTS ConvertSpellClickConditions;
@@ -185,7 +187,7 @@ BEGIN
     DECLARE quest INT DEFAULT 0;
     DECLARE quest2 INT DEFAULT 0;
     DECLARE questStartCanActive INT DEFAULT 0;
-    DECLARE maxElseGroupId INT DEFAULT 14; # Change this for custom content
+    DECLARE maxElseGroupId INT DEFAULT 14; -- Change this for custom content
     SELECT COUNT(*) INTO recordCount FROM `npc_spellclick_spells` WHERE `aura_required` !=0;
     WHILE counter < recordCount DO
         SELECT `npc_entry`, `spell_id`, `aura_required`
@@ -228,12 +230,12 @@ BEGIN
         `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`)
         VALUES (18,npcEntry,spellId,maxElseGroupId+1,8,0,quest,0,0,'Required quest rewarded for spellclick');
         SET maxElseGroupId = maxElseGroupId+1;
-        # ELSE IF quest2 != 0 is handled in next loop (forbidden rewarded quest)
+        -- ELSE IF quest2 != 0 is handled in next loop (forbidden rewarded quest)
         ELSEIF questStartCanActive = 1 && quest2 = quest THEN
         INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,
         `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`)
         VALUES (18,npcEntry,spellId,9,0,quest,0,0,'Required quest active for spellclick');
-        # ^Adds the required active quest condition. Prohibit quest reward is done in next loop
+        -- ^Adds the required active quest condition. Prohibit quest reward is done in next loop
         ELSEIF questStartCanActive = 0 THEN
         INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,
         `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`)
diff --git a/sql/updates/world/2012_02_21_00_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_02_21_00_world_creature_loot_template.sql
index 1d05c031868..1d05c031868 100644
--- a/sql/updates/world/2012_02_21_00_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_02_21_00_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_02_21_01_world_conditions.sql b/sql/old/3.3.5a/2012_02_21_01_world_conditions.sql
index 54685868186..95c32703ea4 100644
--- a/sql/updates/world/2012_02_21_01_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_02_21_01_world_conditions.sql
@@ -3589,4 +3589,4 @@ UPDATE `conditions` SET `ConditionTypeOrReference` = 32, `ConditionValue1` = 0x9
 UPDATE `conditions` SET `ConditionTypeOrReference` = 31, `ConditionValue1` = 5 WHERE `ConditionTypeOrReference` = 18 AND `ConditionValue1` = 0;
 
 DROP TABLE `temp_convert_spells`;
-DROP TABLE `temp_cond_vals`;
\ No newline at end of file
+DROP TABLE `temp_cond_vals`;
diff --git a/sql/updates/world/2012_02_21_02_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_02_21_02_world_creature_loot_template.sql
index 6c6af7ed2a3..6c6af7ed2a3 100644
--- a/sql/updates/world/2012_02_21_02_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_02_21_02_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_02_21_03_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_02_21_03_world_creature_loot_template.sql
index d7d043cbda9..d7d043cbda9 100644
--- a/sql/updates/world/2012_02_21_03_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_02_21_03_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_02_21_04_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_02_21_04_world_creature_loot_template.sql
index 3deedbf0b0d..3deedbf0b0d 100644
--- a/sql/updates/world/2012_02_21_04_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_02_21_04_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_02_21_05_world_gossip.sql b/sql/old/3.3.5a/2012_02_21_05_world_gossip.sql
index 1bdccae5c39..1bdccae5c39 100644
--- a/sql/updates/world/2012_02_21_05_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_02_21_05_world_gossip.sql
diff --git a/sql/updates/world/2012_02_21_06_world_Gossip.sql b/sql/old/3.3.5a/2012_02_21_06_world_Gossip.sql
index a59d330c6a3..a59d330c6a3 100644
--- a/sql/updates/world/2012_02_21_06_world_Gossip.sql
+++ b/sql/old/3.3.5a/2012_02_21_06_world_Gossip.sql
diff --git a/sql/updates/world/2012_02_22_00_world_SAI.sql b/sql/old/3.3.5a/2012_02_22_00_world_sai.sql
index 2e392f3a45f..2e392f3a45f 100644
--- a/sql/updates/world/2012_02_22_00_world_SAI.sql
+++ b/sql/old/3.3.5a/2012_02_22_00_world_sai.sql
diff --git a/sql/updates/world/2012_02_22_01_world_creature_text.sql b/sql/old/3.3.5a/2012_02_22_01_world_creature_text.sql
index 035962e11c3..8b7761e48a0 100644
--- a/sql/updates/world/2012_02_22_01_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_02_22_01_world_creature_text.sql
@@ -31,4 +31,4 @@ INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`pr
 (15214,27,0, 'The Horde has defended Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'),
 (15214,28,0, 'The Horde has captured Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'),
 (15214,29,0, 'The Alliance has defended Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'),
-(15214,30,0, 'The Alliance has captured Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker');
\ No newline at end of file
+(15214,30,0, 'The Alliance has captured Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker');
diff --git a/sql/updates/world/2012_02_22_02_world_misc.sql b/sql/old/3.3.5a/2012_02_22_02_world_misc.sql
index 33bec2a9b78..33bec2a9b78 100644
--- a/sql/updates/world/2012_02_22_02_world_misc.sql
+++ b/sql/old/3.3.5a/2012_02_22_02_world_misc.sql
diff --git a/sql/updates/world/2012_02_22_03_world_conditions.sql b/sql/old/3.3.5a/2012_02_22_03_world_conditions.sql
index 9c4d0cdec95..9c4d0cdec95 100644
--- a/sql/updates/world/2012_02_22_03_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_02_22_03_world_conditions.sql
diff --git a/sql/updates/world/2012_02_23_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_02_23_00_world_spell_script_names.sql
index 6ea96033091..6ea96033091 100644
--- a/sql/updates/world/2012_02_23_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_02_23_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_02_24_00_world_gameobject_loot_template.sql b/sql/old/3.3.5a/2012_02_24_00_world_gameobject_loot_template.sql
index daecfc02dfc..daecfc02dfc 100644
--- a/sql/updates/world/2012_02_24_00_world_gameobject_loot_template.sql
+++ b/sql/old/3.3.5a/2012_02_24_00_world_gameobject_loot_template.sql
diff --git a/sql/updates/world/2012_02_24_01_world_sai.sql b/sql/old/3.3.5a/2012_02_24_01_world_sai.sql
index 19e4e8fb772..19e4e8fb772 100644
--- a/sql/updates/world/2012_02_24_01_world_sai.sql
+++ b/sql/old/3.3.5a/2012_02_24_01_world_sai.sql
diff --git a/sql/updates/world/2012_02_25_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_02_25_00_world_spell_script_names.sql
index 9619121e982..9619121e982 100644
--- a/sql/updates/world/2012_02_25_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_02_25_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_02_25_01_world_command.sql b/sql/old/3.3.5a/2012_02_25_01_world_command.sql
index de708b7a9cc..de708b7a9cc 100644
--- a/sql/updates/world/2012_02_25_01_world_command.sql
+++ b/sql/old/3.3.5a/2012_02_25_01_world_command.sql
diff --git a/sql/updates/world/2012_02_25_01_world_misc.sql b/sql/old/3.3.5a/2012_02_25_01_world_misc.sql
index deedd50a819..deedd50a819 100644
--- a/sql/updates/world/2012_02_25_01_world_misc.sql
+++ b/sql/old/3.3.5a/2012_02_25_01_world_misc.sql
diff --git a/sql/updates/world/2012_02_25_02_world_sai.sql b/sql/old/3.3.5a/2012_02_25_02_world_sai.sql
index e2ff99534b4..e2ff99534b4 100644
--- a/sql/updates/world/2012_02_25_02_world_sai.sql
+++ b/sql/old/3.3.5a/2012_02_25_02_world_sai.sql
diff --git a/sql/updates/world/2012_02_26_00_world_misc.sql b/sql/old/3.3.5a/2012_02_26_00_world_misc.sql
index 3df42934aa9..3df42934aa9 100644
--- a/sql/updates/world/2012_02_26_00_world_misc.sql
+++ b/sql/old/3.3.5a/2012_02_26_00_world_misc.sql
diff --git a/sql/updates/world/2012_02_26_01_world_spell_script_names.sql b/sql/old/3.3.5a/2012_02_26_01_world_spell_script_names.sql
index 7bb38d5f2e0..7bb38d5f2e0 100644
--- a/sql/updates/world/2012_02_26_01_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_02_26_01_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_02_27_00_world_creature_template.sql b/sql/old/3.3.5a/2012_02_27_00_world_creature_template.sql
index b8936774e36..b8936774e36 100644
--- a/sql/updates/world/2012_02_27_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_02_27_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_02_28_00_world_wintergrasp_spawns.sql b/sql/old/3.3.5a/2012_02_28_00_world_wintergrasp_spawns.sql
index 99c2444f20b..9c07709246f 100644
--- a/sql/updates/world/2012_02_28_00_world_wintergrasp_spawns.sql
+++ b/sql/old/3.3.5a/2012_02_28_00_world_wintergrasp_spawns.sql
@@ -363,4 +363,4 @@ INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`
 (@OGUID+16,192400,571,1,32,5041.650879,3294.318604,381.919952,-1.605702,0,0,0,1,180,0,1),
 (@OGUID+17,192401,571,1,32,4855.444336,3297.600830,376.495758,-3.115388,0,0,0,1,180,0,1),
 (@OGUID+18,192281,571,1,32,4857.971191,3335.415771,369.291901,-2.888511,0,0,0,1,180,0,1),
-(@OGUID+19,192282,571,1,32,5006.322754,3280.362061,371.242249,2.242746,0,0,0,1,180,0,1);
\ No newline at end of file
+(@OGUID+19,192282,571,1,32,5006.322754,3280.362061,371.242249,2.242746,0,0,0,1,180,0,1);
diff --git a/sql/updates/world/2012_02_29_00_world_conditions_misc.sql b/sql/old/3.3.5a/2012_02_29_00_world_conditions_misc.sql
index 34eb1261ed1..34eb1261ed1 100644
--- a/sql/updates/world/2012_02_29_00_world_conditions_misc.sql
+++ b/sql/old/3.3.5a/2012_02_29_00_world_conditions_misc.sql
diff --git a/sql/updates/world/2012_02_29_01_world_conditions.sql b/sql/old/3.3.5a/2012_02_29_01_world_conditions.sql
index bae8baf51a9..bae8baf51a9 100644
--- a/sql/updates/world/2012_02_29_01_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_02_29_01_world_conditions.sql
diff --git a/sql/updates/world/2012_02_29_02_world_conditions.sql b/sql/old/3.3.5a/2012_02_29_02_world_conditions.sql
index a28e6d6424f..a28e6d6424f 100644
--- a/sql/updates/world/2012_02_29_02_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_02_29_02_world_conditions.sql
diff --git a/sql/updates/world/2012_02_29_03_world_creature_text.sql b/sql/old/3.3.5a/2012_02_29_03_world_creature_text.sql
index 2e1d3d77dde..2e1d3d77dde 100644
--- a/sql/updates/world/2012_02_29_03_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_02_29_03_world_creature_text.sql
diff --git a/sql/updates/world/2012_02_29_04_world_creature_text.sql b/sql/old/3.3.5a/2012_02_29_04_world_creature_text.sql
index d8b7c2c048a..d8b7c2c048a 100644
--- a/sql/updates/world/2012_02_29_04_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_02_29_04_world_creature_text.sql
diff --git a/sql/updates/world/2012_02_29_05_world_creature_text.sql b/sql/old/3.3.5a/2012_02_29_05_world_creature_text.sql
index 332fecf6326..332fecf6326 100644
--- a/sql/updates/world/2012_02_29_05_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_02_29_05_world_creature_text.sql
diff --git a/sql/updates/world/2012_03_01_00_world_conditions.sql b/sql/old/3.3.5a/2012_03_01_00_world_conditions.sql
index 794a5ce1210..794a5ce1210 100644
--- a/sql/updates/world/2012_03_01_00_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_03_01_00_world_conditions.sql
diff --git a/sql/updates/world/2012_03_01_01_world_creature_text.sql b/sql/old/3.3.5a/2012_03_01_01_world_creature_text.sql
index dd4f6693654..dd4f6693654 100644
--- a/sql/updates/world/2012_03_01_01_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_03_01_01_world_creature_text.sql
diff --git a/sql/updates/world/2012_03_01_02_world_locales_creature_text.sql b/sql/old/3.3.5a/2012_03_01_02_world_locales_creature_text.sql
index c44ca191835..c44ca191835 100644
--- a/sql/updates/world/2012_03_01_02_world_locales_creature_text.sql
+++ b/sql/old/3.3.5a/2012_03_01_02_world_locales_creature_text.sql
diff --git a/sql/updates/world/2012_03_03_00_world_command.sql b/sql/old/3.3.5a/2012_03_03_00_world_command.sql
index 52938c0b76b..52938c0b76b 100644
--- a/sql/updates/world/2012_03_03_00_world_command.sql
+++ b/sql/old/3.3.5a/2012_03_03_00_world_command.sql
diff --git a/sql/updates/world/2012_03_04_00_world_misc.sql b/sql/old/3.3.5a/2012_03_04_00_world_misc.sql
index af556f648b8..af556f648b8 100644
--- a/sql/updates/world/2012_03_04_00_world_misc.sql
+++ b/sql/old/3.3.5a/2012_03_04_00_world_misc.sql
diff --git a/sql/updates/world/2012_03_04_01_world_areatrigger_scripts.sql b/sql/old/3.3.5a/2012_03_04_01_world_areatrigger_scripts.sql
index ae4a0bc1f77..ae4a0bc1f77 100644
--- a/sql/updates/world/2012_03_04_01_world_areatrigger_scripts.sql
+++ b/sql/old/3.3.5a/2012_03_04_01_world_areatrigger_scripts.sql
diff --git a/sql/updates/world/2012_03_06_00_world_commands.sql b/sql/old/3.3.5a/2012_03_06_00_world_commands.sql
index d782a76c70d..d782a76c70d 100644
--- a/sql/updates/world/2012_03_06_00_world_commands.sql
+++ b/sql/old/3.3.5a/2012_03_06_00_world_commands.sql
diff --git a/sql/updates/world/2012_03_06_01_world_misc.sql b/sql/old/3.3.5a/2012_03_06_01_world_misc.sql
index 7eb208a9673..7eb208a9673 100644
--- a/sql/updates/world/2012_03_06_01_world_misc.sql
+++ b/sql/old/3.3.5a/2012_03_06_01_world_misc.sql
diff --git a/sql/updates/world/2012_03_06_02_world_queststatus_seasonal.sql b/sql/old/3.3.5a/2012_03_06_02_world_queststatus_seasonal.sql
index 0efbb6609cf..0efbb6609cf 100644
--- a/sql/updates/world/2012_03_06_02_world_queststatus_seasonal.sql
+++ b/sql/old/3.3.5a/2012_03_06_02_world_queststatus_seasonal.sql
diff --git a/sql/updates/world/2012_03_06_03_world_smart_scripts.sql b/sql/old/3.3.5a/2012_03_06_03_world_smart_scripts.sql
index cb2468c4d5c..cb2468c4d5c 100644
--- a/sql/updates/world/2012_03_06_03_world_smart_scripts.sql
+++ b/sql/old/3.3.5a/2012_03_06_03_world_smart_scripts.sql
diff --git a/sql/updates/world/2012_03_06_04_world_creature_text.sql b/sql/old/3.3.5a/2012_03_06_04_world_creature_text.sql
index f49599e1ba0..f49599e1ba0 100644
--- a/sql/updates/world/2012_03_06_04_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_03_06_04_world_creature_text.sql
diff --git a/sql/updates/world/2012_03_07_00_world_trinity_string.sql b/sql/old/3.3.5a/2012_03_07_00_world_trinity_string.sql
index 96344520236..df5afea5d4f 100644
--- a/sql/updates/world/2012_03_07_00_world_trinity_string.sql
+++ b/sql/old/3.3.5a/2012_03_07_00_world_trinity_string.sql
@@ -1,3 +1,3 @@
 DELETE FROM `trinity_string` WHERE `entry`=175;
 INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES
-(175, 'Liquid level: %f, ground: %f, type: %u, flags %u, status: %d.');
\ No newline at end of file
+(175, 'Liquid level: %f, ground: %f, type: %u, flags %u, status: %d.');
diff --git a/sql/updates/world/2012_03_10_00_world_creature.sql b/sql/old/3.3.5a/2012_03_10_00_world_creature.sql
index a0143af73c7..a0143af73c7 100644
--- a/sql/updates/world/2012_03_10_00_world_creature.sql
+++ b/sql/old/3.3.5a/2012_03_10_00_world_creature.sql
diff --git a/sql/updates/world/2012_03_10_00_world_smart_scripts.sql b/sql/old/3.3.5a/2012_03_10_00_world_smart_scripts.sql
index aaa02c2e3df..aaa02c2e3df 100644
--- a/sql/updates/world/2012_03_10_00_world_smart_scripts.sql
+++ b/sql/old/3.3.5a/2012_03_10_00_world_smart_scripts.sql
diff --git a/sql/updates/world/2012_03_10_00_world_waypoint_data.sql b/sql/old/3.3.5a/2012_03_10_00_world_waypoint_data.sql
index 01c2bc50402..01c2bc50402 100644
--- a/sql/updates/world/2012_03_10_00_world_waypoint_data.sql
+++ b/sql/old/3.3.5a/2012_03_10_00_world_waypoint_data.sql
diff --git a/sql/updates/world/2012_03_11_00_world_sai.sql b/sql/old/3.3.5a/2012_03_11_00_world_sai.sql
index a8cab265ac0..a8cab265ac0 100644
--- a/sql/updates/world/2012_03_11_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_03_11_00_world_sai.sql
diff --git a/sql/updates/world/2012_03_12_00_world_creature_template.sql b/sql/old/3.3.5a/2012_03_12_00_world_creature_template.sql
index cc70ff7a557..cc70ff7a557 100644
--- a/sql/updates/world/2012_03_12_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_03_12_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_03_12_01_world_conditions.sql b/sql/old/3.3.5a/2012_03_12_01_world_conditions.sql
index d58d8f54ddf..d58d8f54ddf 100644
--- a/sql/updates/world/2012_03_12_01_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_03_12_01_world_conditions.sql
diff --git a/sql/updates/world/2012_03_12_01_world_gameobject.sql b/sql/old/3.3.5a/2012_03_12_01_world_gameobject.sql
index 38c615a3b0a..38c615a3b0a 100644
--- a/sql/updates/world/2012_03_12_01_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_03_12_01_world_gameobject.sql
diff --git a/sql/updates/world/2012_03_12_01_world_spell_script_names.sql b/sql/old/3.3.5a/2012_03_12_01_world_spell_script_names.sql
index db98aa0fbea..db98aa0fbea 100644
--- a/sql/updates/world/2012_03_12_01_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_03_12_01_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_03_14_00_world_creature_addon.sql b/sql/old/3.3.5a/2012_03_14_00_world_creature_addon.sql
index c7e4edb97ed..c7e4edb97ed 100644
--- a/sql/updates/world/2012_03_14_00_world_creature_addon.sql
+++ b/sql/old/3.3.5a/2012_03_14_00_world_creature_addon.sql
diff --git a/sql/updates/world/2012_03_19_00_world_smart_scripts.sql b/sql/old/3.3.5a/2012_03_19_00_world_smart_scripts.sql
index 20241efa9cc..20241efa9cc 100644
--- a/sql/updates/world/2012_03_19_00_world_smart_scripts.sql
+++ b/sql/old/3.3.5a/2012_03_19_00_world_smart_scripts.sql
diff --git a/sql/updates/world/2012_03_20_00_world_gossip.sql b/sql/old/3.3.5a/2012_03_20_00_world_gossip.sql
index 00214d805e7..00214d805e7 100644
--- a/sql/updates/world/2012_03_20_00_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_03_20_00_world_gossip.sql
diff --git a/sql/updates/world/2012_03_21_00_world_creature.sql b/sql/old/3.3.5a/2012_03_21_00_world_creature.sql
index def72f74cd6..def72f74cd6 100644
--- a/sql/updates/world/2012_03_21_00_world_creature.sql
+++ b/sql/old/3.3.5a/2012_03_21_00_world_creature.sql
diff --git a/sql/updates/world/2012_03_22_00_world_creature_template.sql b/sql/old/3.3.5a/2012_03_22_00_world_creature_template.sql
index e6c03ed589c..e6c03ed589c 100644
--- a/sql/updates/world/2012_03_22_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_03_22_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_03_22_01_world_conditions.sql b/sql/old/3.3.5a/2012_03_22_01_world_conditions.sql
index 074328137a5..074328137a5 100644
--- a/sql/updates/world/2012_03_22_01_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_03_22_01_world_conditions.sql
diff --git a/sql/updates/world/2012_03_23_00_world_ip2nation.sql b/sql/old/3.3.5a/2012_03_23_00_world_ip2nation.sql
index dadeaddf85a..dadeaddf85a 100644
--- a/sql/updates/world/2012_03_23_00_world_ip2nation.sql
+++ b/sql/old/3.3.5a/2012_03_23_00_world_ip2nation.sql
diff --git a/sql/updates/world/2012_03_24_00_world_misc.sql b/sql/old/3.3.5a/2012_03_24_00_world_misc.sql
index e6f6ce77307..e6f6ce77307 100644
--- a/sql/updates/world/2012_03_24_00_world_misc.sql
+++ b/sql/old/3.3.5a/2012_03_24_00_world_misc.sql
diff --git a/sql/updates/world/2012_03_24_01_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_03_24_01_world_creature_loot_template.sql
index 078c48a47b7..078c48a47b7 100644
--- a/sql/updates/world/2012_03_24_01_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_03_24_01_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_03_24_02_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_03_24_02_world_creature_loot_template.sql
index cdac3335aed..cdac3335aed 100644
--- a/sql/updates/world/2012_03_24_02_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_03_24_02_world_creature_loot_template.sql
diff --git a/sql/updates/auth/2012_03_25_00_auth_misc.sql b/sql/old/3.3.5a/2012_03_25_00_auth_misc.sql
index f34882af8f6..f34882af8f6 100644
--- a/sql/updates/auth/2012_03_25_00_auth_misc.sql
+++ b/sql/old/3.3.5a/2012_03_25_00_auth_misc.sql
diff --git a/sql/updates/world/2012_03_25_00_world_game_event.sql b/sql/old/3.3.5a/2012_03_25_00_world_game_event.sql
index 82dfaa3f494..82dfaa3f494 100644
--- a/sql/updates/world/2012_03_25_00_world_game_event.sql
+++ b/sql/old/3.3.5a/2012_03_25_00_world_game_event.sql
diff --git a/sql/updates/auth/2012_03_26_00_auth_realmlist.sql b/sql/old/3.3.5a/2012_03_26_00_auth_realmlist.sql
index 0a570a31773..0a570a31773 100644
--- a/sql/updates/auth/2012_03_26_00_auth_realmlist.sql
+++ b/sql/old/3.3.5a/2012_03_26_00_auth_realmlist.sql
diff --git a/sql/updates/world/2012_03_26_00_world_creature_template.sql b/sql/old/3.3.5a/2012_03_26_00_world_creature_template.sql
index f60849476bd..f60849476bd 100644
--- a/sql/updates/world/2012_03_26_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_03_26_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_03_26_01_world_spell_script_names.sql b/sql/old/3.3.5a/2012_03_26_01_world_spell_script_names.sql
index 0a5c90f798f..0a5c90f798f 100644
--- a/sql/updates/world/2012_03_26_01_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_03_26_01_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_03_27_00_world_misc.sql b/sql/old/3.3.5a/2012_03_27_00_world_misc.sql
index 132c91b81d7..132c91b81d7 100644
--- a/sql/updates/world/2012_03_27_00_world_misc.sql
+++ b/sql/old/3.3.5a/2012_03_27_00_world_misc.sql
diff --git a/sql/updates/world/2012_03_27_01_world_misc.sql b/sql/old/3.3.5a/2012_03_27_01_world_misc.sql
index 38c11c8ae65..38c11c8ae65 100644
--- a/sql/updates/world/2012_03_27_01_world_misc.sql
+++ b/sql/old/3.3.5a/2012_03_27_01_world_misc.sql
diff --git a/sql/updates/world/2012_03_27_02_world_misc.sql b/sql/old/3.3.5a/2012_03_27_02_world_misc.sql
index f83a98b8100..f83a98b8100 100644
--- a/sql/updates/world/2012_03_27_02_world_misc.sql
+++ b/sql/old/3.3.5a/2012_03_27_02_world_misc.sql
diff --git a/sql/updates/world/2012_03_27_03_world_misc.sql b/sql/old/3.3.5a/2012_03_27_03_world_misc.sql
index aba847dbc3f..aba847dbc3f 100644
--- a/sql/updates/world/2012_03_27_03_world_misc.sql
+++ b/sql/old/3.3.5a/2012_03_27_03_world_misc.sql
diff --git a/sql/updates/world/2012_03_27_04_world_misc.sql b/sql/old/3.3.5a/2012_03_27_04_world_misc.sql
index e85350476c9..e85350476c9 100644
--- a/sql/updates/world/2012_03_27_04_world_misc.sql
+++ b/sql/old/3.3.5a/2012_03_27_04_world_misc.sql
diff --git a/sql/updates/auth/2012_03_28_00_auth_account.sql b/sql/old/3.3.5a/2012_03_28_00_auth_account.sql
index 199baac5178..199baac5178 100644
--- a/sql/updates/auth/2012_03_28_00_auth_account.sql
+++ b/sql/old/3.3.5a/2012_03_28_00_auth_account.sql
diff --git a/sql/updates/auth/2012_03_28_01_auth_account_access.sql b/sql/old/3.3.5a/2012_03_28_01_auth_account_access.sql
index 456dbf6c104..456dbf6c104 100644
--- a/sql/updates/auth/2012_03_28_01_auth_account_access.sql
+++ b/sql/old/3.3.5a/2012_03_28_01_auth_account_access.sql
diff --git a/sql/updates/world/2012_03_28_01_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_03_28_01_world_spell_bonus_data.sql
index e150cad1c2e..e150cad1c2e 100644
--- a/sql/updates/world/2012_03_28_01_world_spell_bonus_data.sql
+++ b/sql/old/3.3.5a/2012_03_28_01_world_spell_bonus_data.sql
diff --git a/sql/updates/auth/2012_03_28_02_auth_account_banned.sql b/sql/old/3.3.5a/2012_03_28_02_auth_account_banned.sql
index 917cea1a684..917cea1a684 100644
--- a/sql/updates/auth/2012_03_28_02_auth_account_banned.sql
+++ b/sql/old/3.3.5a/2012_03_28_02_auth_account_banned.sql
diff --git a/sql/updates/auth/2012_03_28_03_auth_ip_banned.sql b/sql/old/3.3.5a/2012_03_28_03_auth_ip_banned.sql
index 2e754effc60..2e754effc60 100644
--- a/sql/updates/auth/2012_03_28_03_auth_ip_banned.sql
+++ b/sql/old/3.3.5a/2012_03_28_03_auth_ip_banned.sql
diff --git a/sql/updates/auth/2012_03_28_04_auth_logs.sql b/sql/old/3.3.5a/2012_03_28_04_auth_logs.sql
index 4c837a47ed1..4c837a47ed1 100644
--- a/sql/updates/auth/2012_03_28_04_auth_logs.sql
+++ b/sql/old/3.3.5a/2012_03_28_04_auth_logs.sql
diff --git a/sql/updates/auth/2012_03_28_05_auth_realmcharacters.sql b/sql/old/3.3.5a/2012_03_28_05_auth_realmcharacters.sql
index e50b3c3f331..e50b3c3f331 100644
--- a/sql/updates/auth/2012_03_28_05_auth_realmcharacters.sql
+++ b/sql/old/3.3.5a/2012_03_28_05_auth_realmcharacters.sql
diff --git a/sql/updates/auth/2012_03_28_06_auth_realmlist.sql b/sql/old/3.3.5a/2012_03_28_06_auth_realmlist.sql
index 725702a9803..725702a9803 100644
--- a/sql/updates/auth/2012_03_28_06_auth_realmlist.sql
+++ b/sql/old/3.3.5a/2012_03_28_06_auth_realmlist.sql
diff --git a/sql/updates/auth/2012_03_28_07_auth_uptime.sql b/sql/old/3.3.5a/2012_03_28_07_auth_uptime.sql
index 0ea4e3321df..0ea4e3321df 100644
--- a/sql/updates/auth/2012_03_28_07_auth_uptime.sql
+++ b/sql/old/3.3.5a/2012_03_28_07_auth_uptime.sql
diff --git a/sql/updates/world/2012_03_30_00_world_smart_scripts.sql b/sql/old/3.3.5a/2012_03_30_00_world_smart_scripts.sql
index 3ec709d76c1..3ec709d76c1 100644
--- a/sql/updates/world/2012_03_30_00_world_smart_scripts.sql
+++ b/sql/old/3.3.5a/2012_03_30_00_world_smart_scripts.sql
diff --git a/sql/updates/world/2012_03_31_00_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_03_31_00_world_creature_loot_template.sql
index a817cdccf50..a817cdccf50 100644
--- a/sql/updates/world/2012_03_31_00_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_03_31_00_world_creature_loot_template.sql
diff --git a/sql/updates/auth/2012_04_01_00_auth_realmlist.sql b/sql/old/3.3.5a/2012_04_01_00_auth_realmlist.sql
index e2e1efaf993..e2e1efaf993 100644
--- a/sql/updates/auth/2012_04_01_00_auth_realmlist.sql
+++ b/sql/old/3.3.5a/2012_04_01_00_auth_realmlist.sql
diff --git a/sql/updates/world/2012_04_01_00_world_creature.sql b/sql/old/3.3.5a/2012_04_01_00_world_creature.sql
index f6a42a6ef08..f6a42a6ef08 100644
--- a/sql/updates/world/2012_04_01_00_world_creature.sql
+++ b/sql/old/3.3.5a/2012_04_01_00_world_creature.sql
diff --git a/sql/updates/world/2012_04_01_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_04_01_00_world_spell_script_names.sql
index 9d37f6ad4cb..9d37f6ad4cb 100644
--- a/sql/updates/world/2012_04_01_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_04_01_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_04_01_01_world_creature.sql b/sql/old/3.3.5a/2012_04_01_01_world_creature.sql
index f6dff34cfa9..f6dff34cfa9 100644
--- a/sql/updates/world/2012_04_01_01_world_creature.sql
+++ b/sql/old/3.3.5a/2012_04_01_01_world_creature.sql
diff --git a/sql/updates/world/2012_04_01_02_world_spell_group_stack_rules.sql b/sql/old/3.3.5a/2012_04_01_02_world_spell_group_stack_rules.sql
index d42afd1d955..d42afd1d955 100644
--- a/sql/updates/world/2012_04_01_02_world_spell_group_stack_rules.sql
+++ b/sql/old/3.3.5a/2012_04_01_02_world_spell_group_stack_rules.sql
diff --git a/sql/updates/world/2012_04_01_03_world_trainers.sql b/sql/old/3.3.5a/2012_04_01_03_world_trainers.sql
index 1edc9ae09af..1edc9ae09af 100644
--- a/sql/updates/world/2012_04_01_03_world_trainers.sql
+++ b/sql/old/3.3.5a/2012_04_01_03_world_trainers.sql
diff --git a/sql/updates/world/2012_04_01_04_world_conditions.sql b/sql/old/3.3.5a/2012_04_01_04_world_conditions.sql
index e84307e0b05..e84307e0b05 100644
--- a/sql/updates/world/2012_04_01_04_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_04_01_04_world_conditions.sql
diff --git a/sql/updates/world/2012_04_01_05_world_creature_template.sql b/sql/old/3.3.5a/2012_04_01_05_world_creature_template.sql
index a4d13f1513a..a4d13f1513a 100644
--- a/sql/updates/world/2012_04_01_05_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_04_01_05_world_creature_template.sql
diff --git a/sql/updates/world/2012_04_01_06_world_sai.sql b/sql/old/3.3.5a/2012_04_01_06_world_sai.sql
index 9b8857da1e4..9b8857da1e4 100644
--- a/sql/updates/world/2012_04_01_06_world_sai.sql
+++ b/sql/old/3.3.5a/2012_04_01_06_world_sai.sql
diff --git a/sql/updates/world/2012_04_01_07_world_misc.sql b/sql/old/3.3.5a/2012_04_01_07_world_misc.sql
index 346627fd88b..346627fd88b 100644
--- a/sql/updates/world/2012_04_01_07_world_misc.sql
+++ b/sql/old/3.3.5a/2012_04_01_07_world_misc.sql
diff --git a/sql/updates/world/2012_04_03_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_04_03_00_world_spell_script_names.sql
index 70f675daa20..70f675daa20 100644
--- a/sql/updates/world/2012_04_03_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_04_03_00_world_spell_script_names.sql
diff --git a/sql/updates/auth/2012_04_04_00_auth_realmlist.sql b/sql/old/3.3.5a/2012_04_04_00_auth_realmlist.sql
index 18f2d7b3d4c..18f2d7b3d4c 100644
--- a/sql/updates/auth/2012_04_04_00_auth_realmlist.sql
+++ b/sql/old/3.3.5a/2012_04_04_00_auth_realmlist.sql
diff --git a/sql/updates/world/2012_04_04_00_world_conditions.sql b/sql/old/3.3.5a/2012_04_04_00_world_conditions.sql
index 55cab4ca730..55cab4ca730 100644
--- a/sql/updates/world/2012_04_04_00_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_04_04_00_world_conditions.sql
diff --git a/sql/updates/world/2012_04_04_01_world_spell_dbc.sql b/sql/old/3.3.5a/2012_04_04_01_world_spell_dbc.sql
index 7eccdf811e4..7eccdf811e4 100644
--- a/sql/updates/world/2012_04_04_01_world_spell_dbc.sql
+++ b/sql/old/3.3.5a/2012_04_04_01_world_spell_dbc.sql
diff --git a/sql/updates/world/2012_04_05_00_world_gameobject_template.sql b/sql/old/3.3.5a/2012_04_05_00_world_gameobject_template.sql
index d50c4ad8d1c..d50c4ad8d1c 100644
--- a/sql/updates/world/2012_04_05_00_world_gameobject_template.sql
+++ b/sql/old/3.3.5a/2012_04_05_00_world_gameobject_template.sql
diff --git a/sql/updates/world/2012_04_05_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_04_05_00_world_spell_script_names.sql
index 43f6760e8d6..43f6760e8d6 100644
--- a/sql/updates/world/2012_04_05_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_04_05_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_04_05_01_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_04_05_01_world_spell_proc_event.sql
index 076f97b8736..076f97b8736 100644
--- a/sql/updates/world/2012_04_05_01_world_spell_proc_event.sql
+++ b/sql/old/3.3.5a/2012_04_05_01_world_spell_proc_event.sql
diff --git a/sql/updates/world/2012_04_06_00_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_04_06_00_world_spell_proc_event.sql
index 0fba3bb46d6..0fba3bb46d6 100644
--- a/sql/updates/world/2012_04_06_00_world_spell_proc_event.sql
+++ b/sql/old/3.3.5a/2012_04_06_00_world_spell_proc_event.sql
diff --git a/sql/updates/world/2012_04_06_01_world_spell_dbc.sql b/sql/old/3.3.5a/2012_04_06_01_world_spell_dbc.sql
index c0dc38ebf83..c0dc38ebf83 100644
--- a/sql/updates/world/2012_04_06_01_world_spell_dbc.sql
+++ b/sql/old/3.3.5a/2012_04_06_01_world_spell_dbc.sql
diff --git a/sql/updates/world/2012_04_06_02_world_gameobject_template.sql b/sql/old/3.3.5a/2012_04_06_02_world_gameobject_template.sql
index 5089579998d..5089579998d 100644
--- a/sql/updates/world/2012_04_06_02_world_gameobject_template.sql
+++ b/sql/old/3.3.5a/2012_04_06_02_world_gameobject_template.sql
diff --git a/sql/updates/world/2012_04_06_03_world_spell_dbc.sql b/sql/old/3.3.5a/2012_04_06_03_world_spell_dbc.sql
index 90ac4ac0f51..90ac4ac0f51 100644
--- a/sql/updates/world/2012_04_06_03_world_spell_dbc.sql
+++ b/sql/old/3.3.5a/2012_04_06_03_world_spell_dbc.sql
diff --git a/sql/updates/world/2012_04_06_04_world_page_text.sql b/sql/old/3.3.5a/2012_04_06_04_world_page_text.sql
index 97c0d9afe2d..97c0d9afe2d 100644
--- a/sql/updates/world/2012_04_06_04_world_page_text.sql
+++ b/sql/old/3.3.5a/2012_04_06_04_world_page_text.sql
diff --git a/sql/updates/characters/2012_04_07_00_characters_lag_reports.sql b/sql/old/3.3.5a/2012_04_07_00_characters_lag_reports.sql
index 151ace1c976..151ace1c976 100644
--- a/sql/updates/characters/2012_04_07_00_characters_lag_reports.sql
+++ b/sql/old/3.3.5a/2012_04_07_00_characters_lag_reports.sql
diff --git a/sql/updates/world/2012_04_07_00_world_gameobject.sql b/sql/old/3.3.5a/2012_04_07_00_world_gameobject.sql
index c63fc753d32..c63fc753d32 100644
--- a/sql/updates/world/2012_04_07_00_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_04_07_00_world_gameobject.sql
diff --git a/sql/updates/world/2012_04_07_01_world_game_event.sql b/sql/old/3.3.5a/2012_04_07_01_world_game_event.sql
index 7b74a90b49d..7b74a90b49d 100644
--- a/sql/updates/world/2012_04_07_01_world_game_event.sql
+++ b/sql/old/3.3.5a/2012_04_07_01_world_game_event.sql
diff --git a/sql/updates/world/2012_04_07_02_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_04_07_02_world_spell_proc_event.sql
index 62ef49bc657..62ef49bc657 100644
--- a/sql/updates/world/2012_04_07_02_world_spell_proc_event.sql
+++ b/sql/old/3.3.5a/2012_04_07_02_world_spell_proc_event.sql
diff --git a/sql/updates/world/2012_04_08_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_04_08_00_world_spell_script_names.sql
index ca97f419e11..ca97f419e11 100644
--- a/sql/updates/world/2012_04_08_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_04_08_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_04_08_01_world_creature_template.sql b/sql/old/3.3.5a/2012_04_08_01_world_creature_template.sql
index c6665729b75..c6665729b75 100644
--- a/sql/updates/world/2012_04_08_01_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_04_08_01_world_creature_template.sql
diff --git a/sql/updates/world/2012_04_08_02_world_spell_dbc.sql b/sql/old/3.3.5a/2012_04_08_02_world_spell_dbc.sql
index 5775428668d..5775428668d 100644
--- a/sql/updates/world/2012_04_08_02_world_spell_dbc.sql
+++ b/sql/old/3.3.5a/2012_04_08_02_world_spell_dbc.sql
diff --git a/sql/updates/world/2012_04_08_02_world_spell_script_names.sql b/sql/old/3.3.5a/2012_04_08_02_world_spell_script_names.sql
index dd23c9ef560..dd23c9ef560 100644
--- a/sql/updates/world/2012_04_08_02_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_04_08_02_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_04_08_03_world_spell_script_names.sql b/sql/old/3.3.5a/2012_04_08_03_world_spell_script_names.sql
index 744a8bad10d..744a8bad10d 100644
--- a/sql/updates/world/2012_04_08_03_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_04_08_03_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_04_12_00_world_creature_template.sql b/sql/old/3.3.5a/2012_04_12_00_world_creature_template.sql
index ef4596939f5..ef4596939f5 100644
--- a/sql/updates/world/2012_04_12_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_04_12_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_04_12_01_world_creature_template.sql b/sql/old/3.3.5a/2012_04_12_01_world_creature_template.sql
index bfe7b698ae9..bfe7b698ae9 100644
--- a/sql/updates/world/2012_04_12_01_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_04_12_01_world_creature_template.sql
diff --git a/sql/updates/world/2012_04_12_02_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_04_12_02_world_spell_bonus_data.sql
index db35f5d97ee..db35f5d97ee 100644
--- a/sql/updates/world/2012_04_12_02_world_spell_bonus_data.sql
+++ b/sql/old/3.3.5a/2012_04_12_02_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2012_04_12_03_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_04_12_03_world_spell_bonus_data.sql
index d2262e52e98..d2262e52e98 100644
--- a/sql/updates/world/2012_04_12_03_world_spell_bonus_data.sql
+++ b/sql/old/3.3.5a/2012_04_12_03_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2012_04_12_04_world_creature_template.sql b/sql/old/3.3.5a/2012_04_12_04_world_creature_template.sql
index 35664ec5198..35664ec5198 100644
--- a/sql/updates/world/2012_04_12_04_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_04_12_04_world_creature_template.sql
diff --git a/sql/updates/world/2012_04_12_05_world_command.sql b/sql/old/3.3.5a/2012_04_12_05_world_command.sql
index 8eb87155cb2..8eb87155cb2 100644
--- a/sql/updates/world/2012_04_12_05_world_command.sql
+++ b/sql/old/3.3.5a/2012_04_12_05_world_command.sql
diff --git a/sql/updates/world/2012_04_13_00_world_sai.sql b/sql/old/3.3.5a/2012_04_13_00_world_sai.sql
index 0fd4bdddd9b..0fd4bdddd9b 100644
--- a/sql/updates/world/2012_04_13_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_04_13_00_world_sai.sql
diff --git a/sql/updates/world/2012_04_13_01_world_misc.sql b/sql/old/3.3.5a/2012_04_13_01_world_misc.sql
index e4d04449a3f..e4d04449a3f 100644
--- a/sql/updates/world/2012_04_13_01_world_misc.sql
+++ b/sql/old/3.3.5a/2012_04_13_01_world_misc.sql
diff --git a/sql/updates/world/2012_04_13_02_world_misc.sql b/sql/old/3.3.5a/2012_04_13_02_world_misc.sql
index 7c71af78cd7..7c71af78cd7 100644
--- a/sql/updates/world/2012_04_13_02_world_misc.sql
+++ b/sql/old/3.3.5a/2012_04_13_02_world_misc.sql
diff --git a/sql/updates/world/2012_04_13_03_world_bg_template.sql b/sql/old/3.3.5a/2012_04_13_03_world_bg_template.sql
index a426d7c6831..a426d7c6831 100644
--- a/sql/updates/world/2012_04_13_03_world_bg_template.sql
+++ b/sql/old/3.3.5a/2012_04_13_03_world_bg_template.sql
diff --git a/sql/updates/world/2012_04_13_04_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_04_13_04_world_spell_proc_event.sql
index 3ea68187687..3ea68187687 100644
--- a/sql/updates/world/2012_04_13_04_world_spell_proc_event.sql
+++ b/sql/old/3.3.5a/2012_04_13_04_world_spell_proc_event.sql
diff --git a/sql/updates/world/2012_04_14_00_world_gameobject_loot_template.sql b/sql/old/3.3.5a/2012_04_14_00_world_gameobject_loot_template.sql
index dea4b771068..dea4b771068 100644
--- a/sql/updates/world/2012_04_14_00_world_gameobject_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_14_00_world_gameobject_loot_template.sql
diff --git a/sql/updates/world/2012_04_14_01_world_gameobject_loot_template.sql b/sql/old/3.3.5a/2012_04_14_01_world_gameobject_loot_template.sql
index a3dd0c39865..a3dd0c39865 100644
--- a/sql/updates/world/2012_04_14_01_world_gameobject_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_14_01_world_gameobject_loot_template.sql
diff --git a/sql/updates/world/2012_04_14_02_world_creature_template_addon.sql b/sql/old/3.3.5a/2012_04_14_02_world_creature_template_addon.sql
index 6aaa7da383e..6aaa7da383e 100644
--- a/sql/updates/world/2012_04_14_02_world_creature_template_addon.sql
+++ b/sql/old/3.3.5a/2012_04_14_02_world_creature_template_addon.sql
diff --git a/sql/updates/world/2012_04_14_03_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_04_14_03_world_spell_bonus_data.sql
index ee081c17078..ee081c17078 100644
--- a/sql/updates/world/2012_04_14_03_world_spell_bonus_data.sql
+++ b/sql/old/3.3.5a/2012_04_14_03_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2012_04_14_04_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_04_14_04_world_spell_proc_event.sql
index 78a869e655a..78a869e655a 100644
--- a/sql/updates/world/2012_04_14_04_world_spell_proc_event.sql
+++ b/sql/old/3.3.5a/2012_04_14_04_world_spell_proc_event.sql
diff --git a/sql/updates/world/2012_04_14_05_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_04_14_05_world_spell_proc_event.sql
index 8cb2b1d3d2b..8cb2b1d3d2b 100644
--- a/sql/updates/world/2012_04_14_05_world_spell_proc_event.sql
+++ b/sql/old/3.3.5a/2012_04_14_05_world_spell_proc_event.sql
diff --git a/sql/updates/world/2012_04_16_00_world_game_event.sql b/sql/old/3.3.5a/2012_04_16_00_world_game_event.sql
index 1dc3fe3ad91..1dc3fe3ad91 100644
--- a/sql/updates/world/2012_04_16_00_world_game_event.sql
+++ b/sql/old/3.3.5a/2012_04_16_00_world_game_event.sql
diff --git a/sql/updates/world/2012_04_17_00_world_creature.sql b/sql/old/3.3.5a/2012_04_17_00_world_creature.sql
index ebf0fb42a59..ebf0fb42a59 100644
--- a/sql/updates/world/2012_04_17_00_world_creature.sql
+++ b/sql/old/3.3.5a/2012_04_17_00_world_creature.sql
diff --git a/sql/updates/world/2012_04_18_00_world_npc_spellclick_spells.sql b/sql/old/3.3.5a/2012_04_18_00_world_npc_spellclick_spells.sql
index 3bad860290b..3bad860290b 100644
--- a/sql/updates/world/2012_04_18_00_world_npc_spellclick_spells.sql
+++ b/sql/old/3.3.5a/2012_04_18_00_world_npc_spellclick_spells.sql
diff --git a/sql/updates/world/2012_04_18_01_world_creature.sql b/sql/old/3.3.5a/2012_04_18_01_world_creature.sql
index e2d6bdac95b..e2d6bdac95b 100644
--- a/sql/updates/world/2012_04_18_01_world_creature.sql
+++ b/sql/old/3.3.5a/2012_04_18_01_world_creature.sql
diff --git a/sql/updates/world/2012_04_18_02_world_reference_loot_template.sql b/sql/old/3.3.5a/2012_04_18_02_world_reference_loot_template.sql
index 4ed922060d9..4ed922060d9 100644
--- a/sql/updates/world/2012_04_18_02_world_reference_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_18_02_world_reference_loot_template.sql
diff --git a/sql/updates/world/2012_04_18_03_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_04_18_03_world_creature_loot_template.sql
index 5ad26809cdf..5ad26809cdf 100644
--- a/sql/updates/world/2012_04_18_03_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_18_03_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_04_18_04_world_pickpocketing_loot_template.sql b/sql/old/3.3.5a/2012_04_18_04_world_pickpocketing_loot_template.sql
index ab1c562f7dd..ab1c562f7dd 100644
--- a/sql/updates/world/2012_04_18_04_world_pickpocketing_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_18_04_world_pickpocketing_loot_template.sql
diff --git a/sql/updates/world/2012_04_18_05_world_conditions.sql b/sql/old/3.3.5a/2012_04_18_05_world_conditions.sql
index ecf80f270a3..ecf80f270a3 100644
--- a/sql/updates/world/2012_04_18_05_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_04_18_05_world_conditions.sql
diff --git a/sql/updates/world/2012_04_18_06_world_creature_template.sql b/sql/old/3.3.5a/2012_04_18_06_world_creature_template.sql
index 8c167c2ffa1..8c167c2ffa1 100644
--- a/sql/updates/world/2012_04_18_06_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_04_18_06_world_creature_template.sql
diff --git a/sql/updates/world/2012_04_18_07_world_fishing_loot_template.sql b/sql/old/3.3.5a/2012_04_18_07_world_fishing_loot_template.sql
index 6c39cc95b48..6c39cc95b48 100644
--- a/sql/updates/world/2012_04_18_07_world_fishing_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_18_07_world_fishing_loot_template.sql
diff --git a/sql/updates/world/2012_04_18_08_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_04_18_08_world_creature_loot_template.sql
index 4b00685ed55..4b00685ed55 100644
--- a/sql/updates/world/2012_04_18_08_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_18_08_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_04_19_00_world_creature_template.sql b/sql/old/3.3.5a/2012_04_19_00_world_creature_template.sql
index e9abd40095e..e9abd40095e 100644
--- a/sql/updates/world/2012_04_19_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_04_19_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_04_19_01_world_pickpocketing_loot_template.sql b/sql/old/3.3.5a/2012_04_19_01_world_pickpocketing_loot_template.sql
index 997b16ff65d..997b16ff65d 100644
--- a/sql/updates/world/2012_04_19_01_world_pickpocketing_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_19_01_world_pickpocketing_loot_template.sql
diff --git a/sql/updates/world/2012_04_19_02_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_04_19_02_world_creature_loot_template.sql
index 336cd61c0eb..336cd61c0eb 100644
--- a/sql/updates/world/2012_04_19_02_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_19_02_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_04_19_03_world_instance_ulduar.sql b/sql/old/3.3.5a/2012_04_19_03_world_instance_ulduar.sql
index a39ed9c01d5..a39ed9c01d5 100644
--- a/sql/updates/world/2012_04_19_03_world_instance_ulduar.sql
+++ b/sql/old/3.3.5a/2012_04_19_03_world_instance_ulduar.sql
diff --git a/sql/updates/world/2012_04_20_00_world_gameobject_loot_template.sql b/sql/old/3.3.5a/2012_04_20_00_world_gameobject_loot_template.sql
index 47a22d519d0..47a22d519d0 100644
--- a/sql/updates/world/2012_04_20_00_world_gameobject_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_20_00_world_gameobject_loot_template.sql
diff --git a/sql/updates/world/2012_04_20_01_world_item_loot_template.sql b/sql/old/3.3.5a/2012_04_20_01_world_item_loot_template.sql
index af52ade0b25..af52ade0b25 100644
--- a/sql/updates/world/2012_04_20_01_world_item_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_20_01_world_item_loot_template.sql
diff --git a/sql/updates/world/2012_04_20_02_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_04_20_02_world_creature_loot_template.sql
index 09b5beee75c..09b5beee75c 100644
--- a/sql/updates/world/2012_04_20_02_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_20_02_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_04_20_03_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_04_20_03_world_creature_loot_template.sql
index a0b586ee0d9..a0b586ee0d9 100644
--- a/sql/updates/world/2012_04_20_03_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_20_03_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_04_20_04_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_04_20_04_world_creature_loot_template.sql
index 73e01efa23e..73e01efa23e 100644
--- a/sql/updates/world/2012_04_20_04_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_20_04_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_04_20_05_gameobject_template.sql b/sql/old/3.3.5a/2012_04_20_05_gameobject_template.sql
index 24400b16a5c..24400b16a5c 100644
--- a/sql/updates/world/2012_04_20_05_gameobject_template.sql
+++ b/sql/old/3.3.5a/2012_04_20_05_gameobject_template.sql
diff --git a/sql/updates/world/2012_04_21_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_04_21_00_world_spell_script_names.sql
index e61ef4aec74..e61ef4aec74 100644
--- a/sql/updates/world/2012_04_21_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_04_21_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_04_22_00_world_sai.sql b/sql/old/3.3.5a/2012_04_22_00_world_sai.sql
index f223883c8a7..f223883c8a7 100644
--- a/sql/updates/world/2012_04_22_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_04_22_00_world_sai.sql
diff --git a/sql/updates/world/2012_04_23_00_world_creatures.sql b/sql/old/3.3.5a/2012_04_23_00_world_creatures.sql
index 3730fabf552..3730fabf552 100644
--- a/sql/updates/world/2012_04_23_00_world_creatures.sql
+++ b/sql/old/3.3.5a/2012_04_23_00_world_creatures.sql
diff --git a/sql/updates/world/2012_04_23_01_world_conditions.sql b/sql/old/3.3.5a/2012_04_23_01_world_conditions.sql
index c731426aa3f..c731426aa3f 100644
--- a/sql/updates/world/2012_04_23_01_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_04_23_01_world_conditions.sql
diff --git a/sql/updates/world/2012_04_23_02_world_prospecting_loot_template.sql b/sql/old/3.3.5a/2012_04_23_02_world_prospecting_loot_template.sql
index 6ea44d92722..6ea44d92722 100644
--- a/sql/updates/world/2012_04_23_02_world_prospecting_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_23_02_world_prospecting_loot_template.sql
diff --git a/sql/updates/world/2012_04_23_03_world_skinning_loot_template.sql b/sql/old/3.3.5a/2012_04_23_03_world_skinning_loot_template.sql
index a1aa9e070f2..a1aa9e070f2 100644
--- a/sql/updates/world/2012_04_23_03_world_skinning_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_23_03_world_skinning_loot_template.sql
diff --git a/sql/updates/world/2012_04_23_04_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_04_23_04_world_creature_loot_template.sql
index 94d2b092d12..94d2b092d12 100644
--- a/sql/updates/world/2012_04_23_04_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_23_04_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_04_23_05_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_04_23_05_world_creature_loot_template.sql
index ddf0780d362..ddf0780d362 100644
--- a/sql/updates/world/2012_04_23_05_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_23_05_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_04_24_00_world_command.sql b/sql/old/3.3.5a/2012_04_24_00_world_command.sql
index 25912392347..25912392347 100644
--- a/sql/updates/world/2012_04_24_00_world_command.sql
+++ b/sql/old/3.3.5a/2012_04_24_00_world_command.sql
diff --git a/sql/updates/world/2012_04_24_01_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_04_24_01_world_spell_proc_event.sql
index 6e997931bb5..6e997931bb5 100644
--- a/sql/updates/world/2012_04_24_01_world_spell_proc_event.sql
+++ b/sql/old/3.3.5a/2012_04_24_01_world_spell_proc_event.sql
diff --git a/sql/updates/world/2012_04_24_02_world_warden_checks.sql b/sql/old/3.3.5a/2012_04_24_02_world_warden_checks.sql
index 74539f99fb3..74539f99fb3 100644
--- a/sql/updates/world/2012_04_24_02_world_warden_checks.sql
+++ b/sql/old/3.3.5a/2012_04_24_02_world_warden_checks.sql
diff --git a/sql/updates/world/2012_04_24_03_world_spell_script_names.sql b/sql/old/3.3.5a/2012_04_24_03_world_spell_script_names.sql
index a53d8bd585c..a53d8bd585c 100644
--- a/sql/updates/world/2012_04_24_03_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_04_24_03_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_04_24_04_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_04_24_04_world_spell_proc_event.sql
index 5ba6f24ccf8..5ba6f24ccf8 100644
--- a/sql/updates/world/2012_04_24_04_world_spell_proc_event.sql
+++ b/sql/old/3.3.5a/2012_04_24_04_world_spell_proc_event.sql
diff --git a/sql/updates/world/2012_04_24_05_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_04_24_05_world_creature_loot_template.sql
index c524999b492..c524999b492 100644
--- a/sql/updates/world/2012_04_24_05_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_24_05_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_04_24_06_world_misc.sql b/sql/old/3.3.5a/2012_04_24_06_world_misc.sql
index 2e095a76cd9..2e095a76cd9 100644
--- a/sql/updates/world/2012_04_24_06_world_misc.sql
+++ b/sql/old/3.3.5a/2012_04_24_06_world_misc.sql
diff --git a/sql/updates/world/2012_04_25_00_world_misc.sql b/sql/old/3.3.5a/2012_04_25_00_world_misc.sql
index 3d2f20fdc8c..3d2f20fdc8c 100644
--- a/sql/updates/world/2012_04_25_00_world_misc.sql
+++ b/sql/old/3.3.5a/2012_04_25_00_world_misc.sql
diff --git a/sql/updates/world/2012_04_25_01_world_spell_script_names.sql b/sql/old/3.3.5a/2012_04_25_01_world_spell_script_names.sql
index e42f1979229..7b7135860ab 100644
--- a/sql/updates/world/2012_04_25_01_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_04_25_01_world_spell_script_names.sql
@@ -1,3 +1,3 @@
 DELETE FROM `spell_script_names` WHERE `spell_id` = 33110;
 INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
-(33110,'spell_pri_prayer_of_mending_heal');
\ No newline at end of file
+(33110,'spell_pri_prayer_of_mending_heal');
diff --git a/sql/updates/world/2012_04_25_02_world_spell_script_names.sql b/sql/old/3.3.5a/2012_04_25_02_world_spell_script_names.sql
index ea6b95559c6..ad63bc87837 100644
--- a/sql/updates/world/2012_04_25_02_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_04_25_02_world_spell_script_names.sql
@@ -8,4 +8,4 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
 (51592, 'spell_gen_despawn_self'),
 (51910, 'spell_gen_despawn_self'),
 (52267, 'spell_gen_despawn_self'),
-(54420, 'spell_gen_despawn_self');
\ No newline at end of file
+(54420, 'spell_gen_despawn_self');
diff --git a/sql/updates/world/2012_04_25_03_world_spell_group.sql b/sql/old/3.3.5a/2012_04_25_03_world_spell_group.sql
index a6fa90ad41d..a6fa90ad41d 100644
--- a/sql/updates/world/2012_04_25_03_world_spell_group.sql
+++ b/sql/old/3.3.5a/2012_04_25_03_world_spell_group.sql
diff --git a/sql/updates/world/2012_04_26_00_world_conditions.sql b/sql/old/3.3.5a/2012_04_26_00_world_conditions.sql
index 8d525cad057..8d525cad057 100644
--- a/sql/updates/world/2012_04_26_00_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_04_26_00_world_conditions.sql
diff --git a/sql/updates/world/2012_04_26_01_world_smart_scripts.sql b/sql/old/3.3.5a/2012_04_26_01_world_smart_scripts.sql
index e90e7b58433..e90e7b58433 100644
--- a/sql/updates/world/2012_04_26_01_world_smart_scripts.sql
+++ b/sql/old/3.3.5a/2012_04_26_01_world_smart_scripts.sql
diff --git a/sql/updates/world/2012_04_27_00_world_instance_icc.sql b/sql/old/3.3.5a/2012_04_27_00_world_instance_icc.sql
index 6738e4904ab..6738e4904ab 100644
--- a/sql/updates/world/2012_04_27_00_world_instance_icc.sql
+++ b/sql/old/3.3.5a/2012_04_27_00_world_instance_icc.sql
diff --git a/sql/updates/world/2012_04_28_00_world_reference_loot_template.sql b/sql/old/3.3.5a/2012_04_28_00_world_reference_loot_template.sql
index b59ba90fdbc..07c53a8f7c9 100644
--- a/sql/updates/world/2012_04_28_00_world_reference_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_28_00_world_reference_loot_template.sql
@@ -155,4 +155,4 @@ INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`loot
 (@Yogg25,45693,100,16,0,1,1); -- Mimiron's Head
 
 -- Cleanups
-DELETE FROM `conditions` WHERE `SourceEntry`=45897 AND `SourceGroup`=33955;
\ No newline at end of file
+DELETE FROM `conditions` WHERE `SourceEntry`=45897 AND `SourceGroup`=33955;
diff --git a/sql/updates/world/2012_04_28_01_world_reference_loot_template.sql b/sql/old/3.3.5a/2012_04_28_01_world_reference_loot_template.sql
index e46c45e497a..e46c45e497a 100644
--- a/sql/updates/world/2012_04_28_01_world_reference_loot_template.sql
+++ b/sql/old/3.3.5a/2012_04_28_01_world_reference_loot_template.sql
diff --git a/sql/updates/world/2012_05_01_00_world_creature.sql b/sql/old/3.3.5a/2012_05_01_00_world_creature.sql
index c0509d0d132..c0509d0d132 100644
--- a/sql/updates/world/2012_05_01_00_world_creature.sql
+++ b/sql/old/3.3.5a/2012_05_01_00_world_creature.sql
diff --git a/sql/updates/world/2012_05_02_00_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_05_02_00_world_creature_loot_template.sql
index f0721e63635..f0721e63635 100644
--- a/sql/updates/world/2012_05_02_00_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_05_02_00_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_05_03_00_world_creature.sql b/sql/old/3.3.5a/2012_05_03_00_world_creature.sql
index d906dba78bc..d906dba78bc 100644
--- a/sql/updates/world/2012_05_03_00_world_creature.sql
+++ b/sql/old/3.3.5a/2012_05_03_00_world_creature.sql
diff --git a/sql/updates/world/2012_05_03_01_world_cos_misc.sql b/sql/old/3.3.5a/2012_05_03_01_world_cos_misc.sql
index 6c2ea6d3a95..6c2ea6d3a95 100644
--- a/sql/updates/world/2012_05_03_01_world_cos_misc.sql
+++ b/sql/old/3.3.5a/2012_05_03_01_world_cos_misc.sql
diff --git a/sql/updates/world/2012_05_03_02_world_quest_template.sql b/sql/old/3.3.5a/2012_05_03_02_world_quest_template.sql
index 49953bd2166..49953bd2166 100644
--- a/sql/updates/world/2012_05_03_02_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_05_03_02_world_quest_template.sql
diff --git a/sql/updates/world/2012_05_03_03_world_creature_questrelation.sql b/sql/old/3.3.5a/2012_05_03_03_world_creature_questrelation.sql
index 1da4f6d29ad..1da4f6d29ad 100644
--- a/sql/updates/world/2012_05_03_03_world_creature_questrelation.sql
+++ b/sql/old/3.3.5a/2012_05_03_03_world_creature_questrelation.sql
diff --git a/sql/updates/world/2012_05_03_04_world_game_event_creature_quest.sql b/sql/old/3.3.5a/2012_05_03_04_world_game_event_creature_quest.sql
index 62fd4415549..62fd4415549 100644
--- a/sql/updates/world/2012_05_03_04_world_game_event_creature_quest.sql
+++ b/sql/old/3.3.5a/2012_05_03_04_world_game_event_creature_quest.sql
diff --git a/sql/updates/world/2012_05_04_00_world_waypoints.sql b/sql/old/3.3.5a/2012_05_04_00_world_waypoints.sql
index a07bde59d49..a07bde59d49 100644
--- a/sql/updates/world/2012_05_04_00_world_waypoints.sql
+++ b/sql/old/3.3.5a/2012_05_04_00_world_waypoints.sql
diff --git a/sql/updates/world/2012_05_04_01_world_sai.sql b/sql/old/3.3.5a/2012_05_04_01_world_sai.sql
index 7021fc92548..7021fc92548 100644
--- a/sql/updates/world/2012_05_04_01_world_sai.sql
+++ b/sql/old/3.3.5a/2012_05_04_01_world_sai.sql
diff --git a/sql/updates/world/2012_05_05_00_world_sai.sql b/sql/old/3.3.5a/2012_05_05_00_world_sai.sql
index e03c36337af..e03c36337af 100644
--- a/sql/updates/world/2012_05_05_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_05_05_00_world_sai.sql
diff --git a/sql/updates/world/2012_05_05_01_world_creature_template.sql b/sql/old/3.3.5a/2012_05_05_01_world_creature_template.sql
index 2eeaf2f40d2..2eeaf2f40d2 100644
--- a/sql/updates/world/2012_05_05_01_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_05_05_01_world_creature_template.sql
diff --git a/sql/updates/world/2012_05_05_02_world_gameobject.sql b/sql/old/3.3.5a/2012_05_05_02_world_gameobject.sql
index c0b2c6b147b..c0b2c6b147b 100644
--- a/sql/updates/world/2012_05_05_02_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_05_05_02_world_gameobject.sql
diff --git a/sql/updates/world/2012_05_05_03_world_sai.sql b/sql/old/3.3.5a/2012_05_05_03_world_sai.sql
index fce3b5bc957..fce3b5bc957 100644
--- a/sql/updates/world/2012_05_05_03_world_sai.sql
+++ b/sql/old/3.3.5a/2012_05_05_03_world_sai.sql
diff --git a/sql/updates/world/2012_05_05_04_world_creature_template.sql b/sql/old/3.3.5a/2012_05_05_04_world_creature_template.sql
index 7c4f13dd667..7c4f13dd667 100644
--- a/sql/updates/world/2012_05_05_04_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_05_05_04_world_creature_template.sql
diff --git a/sql/updates/world/2012_05_05_05_world_creature_template.sql b/sql/old/3.3.5a/2012_05_05_05_world_creature_template.sql
index a2f2a217252..a2f2a217252 100644
--- a/sql/updates/world/2012_05_05_05_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_05_05_05_world_creature_template.sql
diff --git a/sql/updates/world/2012_05_05_06_world_sai.sql b/sql/old/3.3.5a/2012_05_05_06_world_sai.sql
index 7b064af4a4e..7b064af4a4e 100644
--- a/sql/updates/world/2012_05_05_06_world_sai.sql
+++ b/sql/old/3.3.5a/2012_05_05_06_world_sai.sql
diff --git a/sql/updates/world/2012_05_06_00_world_creature_template.sql b/sql/old/3.3.5a/2012_05_06_00_world_creature_template.sql
index 30dbf85c28d..30dbf85c28d 100644
--- a/sql/updates/world/2012_05_06_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_05_06_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_05_06_01_world_creature_template.sql b/sql/old/3.3.5a/2012_05_06_01_world_creature_template.sql
index fa0c9af5805..fa0c9af5805 100644
--- a/sql/updates/world/2012_05_06_01_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_05_06_01_world_creature_template.sql
diff --git a/sql/updates/world/2012_05_07_00_world_waypoints.sql b/sql/old/3.3.5a/2012_05_07_00_world_waypoints.sql
index f24b7c9c254..f24b7c9c254 100644
--- a/sql/updates/world/2012_05_07_00_world_waypoints.sql
+++ b/sql/old/3.3.5a/2012_05_07_00_world_waypoints.sql
diff --git a/sql/updates/world/2012_05_07_01_world_sai.sql b/sql/old/3.3.5a/2012_05_07_01_world_sai.sql
index 83676d31df9..83676d31df9 100644
--- a/sql/updates/world/2012_05_07_01_world_sai.sql
+++ b/sql/old/3.3.5a/2012_05_07_01_world_sai.sql
diff --git a/sql/updates/world/2012_05_08_00_world_sai.sql b/sql/old/3.3.5a/2012_05_08_00_world_sai.sql
index 8a776b5f2d2..8a776b5f2d2 100644
--- a/sql/updates/world/2012_05_08_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_05_08_00_world_sai.sql
diff --git a/sql/updates/world/2012_05_08_01_world_gameobject.sql b/sql/old/3.3.5a/2012_05_08_01_world_gameobject.sql
index b83d02b4762..b83d02b4762 100644
--- a/sql/updates/world/2012_05_08_01_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_05_08_01_world_gameobject.sql
diff --git a/sql/updates/world/2012_05_08_01_world_misc.sql b/sql/old/3.3.5a/2012_05_08_01_world_misc.sql
index 8f19132fa27..8f19132fa27 100644
--- a/sql/updates/world/2012_05_08_01_world_misc.sql
+++ b/sql/old/3.3.5a/2012_05_08_01_world_misc.sql
diff --git a/sql/updates/world/2012_05_09_00_world_spell_target_position.sql b/sql/old/3.3.5a/2012_05_09_00_world_spell_target_position.sql
index a6e9d7289b7..a6e9d7289b7 100644
--- a/sql/updates/world/2012_05_09_00_world_spell_target_position.sql
+++ b/sql/old/3.3.5a/2012_05_09_00_world_spell_target_position.sql
diff --git a/sql/updates/world/2012_05_09_01_world_commands.sql b/sql/old/3.3.5a/2012_05_09_01_world_commands.sql
index dcd4c9130eb..dcd4c9130eb 100644
--- a/sql/updates/world/2012_05_09_01_world_commands.sql
+++ b/sql/old/3.3.5a/2012_05_09_01_world_commands.sql
diff --git a/sql/old/3.3.5a/2012_05_09_02_world_sai.sql b/sql/old/3.3.5a/2012_05_09_02_world_sai.sql
new file mode 100644
index 00000000000..01004b23505
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_09_02_world_sai.sql
@@ -0,0 +1,116 @@
+-- Fixup for Quest Quest:The Path to the Citadel "Alliance and Horde"
+
+-- Alliance slave add missing equipments
+UPDATE `creature_template` SET `equipment_id`=254 WHERE `entry`=36767;
+
+-- Horde Slave SAI
+UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry` IN (36770,36771,36772,36773);
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (36770,36771,36772,36773);
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (3677000);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(36770,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Reset - Emotestate'),
+(36771,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Reset - Emotestate'),
+(36772,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Reset - Emotestate'),
+(36773,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Reset - Emotestate'),
+(36770,0,1,0,8,0,100,7,71281,0,0,0,80,3677000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Spellhit - Run Script'),
+(36771,0,1,0,8,0,100,7,71281,0,0,0,80,3677000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Spellhit - Run Script'),
+(36772,0,1,0,8,0,100,7,71281,0,0,0,80,3677000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Spellhit - Run Script'),
+(36773,0,1,0,8,0,100,7,71281,0,0,0,80,3677000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - On Spellhit - Run Script'),
+-- Script
+(3677000,9,0,0,0,0,100,0,500,500,500,500,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Horde Slave - Script - Turnto envoker'),
+(3677000,9,1,0,0,0,100,0,500,500,500,500,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - say text'),
+(3677000,9,2,0,0,0,100,0,100,100,100,100,18,512,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - set unitflag'),
+(3677000,9,3,0,0,0,100,0,100,100,100,100,2,250,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - set faction'),
+(3677000,9,4,0,0,0,100,0,100,100,100,100,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - set Emotestate'),
+(3677000,9,5,0,0,0,100,0,100,100,100,100,33,36770,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Horde Slave - Script - give quest credit'),
+(3677000,9,6,0,0,0,100,0,100,100,100,100,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - set run on'),
+(3677000,9,7,0,0,0,100,0,500,500,500,500,69,1,0,0,0,0,0,19,23837,70,0,0,0,0,0, 'Horde Slave - Script - move to closest trigger'),
+(3677000,9,8,0,0,0,100,0,8000,8000,8000,8000,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Horde Slave - Script - despawn');
+
+-- Alliance Slave SAI
+UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry` IN (36764,36765,36766,36767);
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (36764,36765,36766,36767);
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN (3676400);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(36764,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Reset - Emotestate'),
+(36765,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Reset - Emotestate'),
+(36766,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Reset - Emotestate'),
+(36767,0,0,0,11,0,100,6,0,0,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Reset - Emotestate'),
+(36764,0,1,0,8,0,100,7,71281,0,0,0,80,3676400,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Spellhit - Run Script'),
+(36765,0,1,0,8,0,100,7,71281,0,0,0,80,3676400,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Spellhit - Run Script'),
+(36766,0,1,0,8,0,100,7,71281,0,0,0,80,3676400,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Spellhit - Run Script'),
+(36767,0,1,0,8,0,100,7,71281,0,0,0,80,3676400,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - On Spellhit - Run Script'),
+-- Script
+(3676400,9,0,0,0,0,100,0,500,500,500,500,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Alliance Slave - Script - Turnto envoker'),
+(3676400,9,1,0,0,0,100,0,500,500,500,500,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - say text'),
+(3676400,9,2,0,0,0,100,0,100,100,100,100,18,512,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - set unitflag'),
+(3676400,9,3,0,0,0,100,0,100,100,100,100,2,250,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - set faction'),
+(3676400,9,4,0,0,0,100,0,100,100,100,100,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - set Emotestate'),
+(3676400,9,5,0,0,0,100,0,100,100,100,100,33,36764,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Alliance Slave - Script - give quest credit'),
+(3676400,9,6,0,0,0,100,0,100,100,100,100,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - set run on'),
+(3676400,9,7,0,0,0,100,0,500,500,500,500,69,1,0,0,0,0,0,19,23837,70,0,0,0,0,0, 'Alliance Slave - Script - move to closest trigger'),
+(3676400,9,8,0,0,0,100,0,8000,8000,8000,8000,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Alliance Slave - Script - despawn');
+
+-- Ball and chain SAI
+UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry` IN (201969);
+DELETE FROM `smart_scripts` WHERE `source_type`=1 AND `entryorguid` IN (201969);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(201969,1,0,0,64,0,100,6,0,0,0,0,85,71281,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Ball and chain - On Gossip Hello - Envoker cast on self');
+
+-- Spell Conditions
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=71281;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,71281,0,31,3,36770,0,0,'','Spell 71281 targets entry 36770'),
+(13,1,71281,1,31,3,36771,0,0,'','Spell 71281 targets entry 36771'),
+(13,1,71281,2,31,3,36772,0,0,'','Spell 71281 targets entry 36772'),
+(13,1,71281,3,31,3,36773,0,0,'','Spell 71281 targets entry 36773'),
+(13,1,71281,4,31,3,36764,0,0,'','Spell 71281 targets entry 36764'),
+(13,1,71281,5,31,3,36765,0,0,'','Spell 71281 targets entry 36765'),
+(13,1,71281,6,31,3,36766,0,0,'','Spell 71281 targets entry 36766'),
+(13,1,71281,7,31,3,36767,0,0,'','Spell 71281 targets entry 36767');
+
+-- Creature text from sniff
+DELETE FROM `creature_text` WHERE `entry` IN (36770,36771,36772,36773,36764,36765,36766,36767);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+-- Alliance Slaves
+(36764,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Alliance Slave'),
+(36764,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Alliance Slave'),
+(36764,0,2, 'Have my babies.',12,0,100,0,0,0, 'Alliance Slave'),
+(36764,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Alliance Slave'),
+(36764,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Alliance Slave'),
+(36765,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Alliance Slave'),
+(36765,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Alliance Slave'),
+(36765,0,2, 'Have my babies.',12,0,100,0,0,0, 'Alliance Slave'),
+(36765,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Alliance Slave'),
+(36765,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Alliance Slave'),
+(36766,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Alliance Slave'),
+(36766,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Alliance Slave'),
+(36766,0,2, 'Have my babies.',12,0,100,0,0,0, 'Alliance Slave'),
+(36766,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Alliance Slave'),
+(36766,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Alliance Slave'),
+(36767,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Alliance Slave'),
+(36767,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Alliance Slave'),
+(36767,0,2, 'Have my babies.',12,0,100,0,0,0, 'Alliance Slave'),
+(36767,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Alliance Slave'),
+(36767,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Alliance Slave'),
+-- Horde Slaves
+(36770,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Horde Slave'),
+(36770,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Horde Slave'),
+(36770,0,2, 'Have my babies.',12,0,100,0,0,0, 'Horde Slave'),
+(36770,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Horde Slave'),
+(36770,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Horde Slave'),
+(36771,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Horde Slave'),
+(36771,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Horde Slave'),
+(36771,0,2, 'Have my babies.',12,0,100,0,0,0, 'Horde Slave'),
+(36771,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Horde Slave'),
+(36771,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Horde Slave'),
+(36772,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Horde Slave'),
+(36772,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Horde Slave'),
+(36772,0,2, 'Have my babies.',12,0,100,0,0,0, 'Horde Slave'),
+(36772,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Horde Slave'),
+(36772,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Horde Slave'),
+(36773,0,0, 'You''re a beautiful sight... you have no idea.',12,0,100,0,0,0, 'Horde Slave'),
+(36773,0,1, '%s lets his mining pick drag on the ground as she approaches, clearly exhausted.',16,0,100,0,0,0, 'Horde Slave'),
+(36773,0,2, 'Have my babies.',12,0,100,0,0,0, 'Horde Slave'),
+(36773,0,3, 'If by life or death I can repay you, I will.',12,0,100,0,0,0, 'Horde Slave'),
+(36773,0,4, 'I''m going to return to the front of the quarry. Kill a few extra for me.',12,0,100,0,0,0, 'Horde Slave');
diff --git a/sql/old/3.3.5a/2012_05_09_03_world_misc.sql b/sql/old/3.3.5a/2012_05_09_03_world_misc.sql
new file mode 100644
index 00000000000..63e162fcfce
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_09_03_world_misc.sql
@@ -0,0 +1,56 @@
+-- Update Scourgelord Tyrannus "Make him fly"
+UPDATE `creature_template_addon` SET `bytes1`=50331648 WHERE `entry`=36794;
+
+-- Put Rimefang in the air and make him fly
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=36661;
+UPDATE `creature_template_addon` SET `bytes1`=50331648 WHERE `entry`=36661;
+
+-- Deathwhisper Necrolyte SAI
+SET @ENTRY   := 36788; -- NPC entry
+SET @SPELL1  := 69577; -- Shadow Bolt
+SET @SPELL2  := 69578; -- Conversion Beam
+SET @SPELL3  := 45104; -- Shadow Channelling
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,6,100,100,3000,3000,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Deathwhisper Necrolyte - Combat - Cast Shadow Bolt'),
+(@ENTRY,0,1,0,0,0,100,6,9000,9000,24000,24000,11,@SPELL2,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Deathwhisper Necrolyte - Combat - Cast Conversion Beam');
+
+-- Deathwhisper Necrolyte pathing
+SET @NPC := 202231;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=592.975,`position_y`=176.104,`position_z`=508.746 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,596.0208,175.5243,508.3654,0,0,0,100,0),
+(@PATH,2,605.2656,157.7101,507.2126,0,0,0,100,0),
+(@PATH,3,604.4063,146.283,507.3376,0,0,0,100,0),
+(@PATH,4,592.2899,131.4271,507.8163,0,0,0,100,0),
+(@PATH,5,577.4531,118.224,508.3163,0,0,0,100,0),
+(@PATH,6,563.0695,103.7309,514.1504,0,0,0,100,0),
+(@PATH,7,557.7743,89.41319,523.1727,0,0,0,100,0),
+(@PATH,8,560.9583,77.65278,525.4227,0,0,0,100,0),
+(@PATH,9,560.9583,77.65278,525.4227,0,0,0,100,0),
+(@PATH,10,571.0139,69.43403,525.2753,0,0,0,100,0),
+(@PATH,11,560.9583,77.65278,525.4227,0,0,0,100,0),
+(@PATH,12,557.7743,89.41319,523.1727,0,0,0,100,0),
+(@PATH,13,563.0695,103.7309,514.1504,0,0,0,100,0),
+(@PATH,14,577.4531,118.224,508.3163,0,0,0,100,0),
+(@PATH,15,592.2899,131.4271,507.8163,0,0,0,100,0),
+(@PATH,16,604.4063,146.283,507.3376,0,0,0,100,0),
+(@PATH,17,605.2656,157.7101,507.2126,0,0,0,100,0),
+(@PATH,18,596.0208,175.5243,508.3654,0,0,0,100,0);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=202231;
+INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES
+(202231,202231,0,0,2),
+(202231,202099,7,288,2),
+(202231,202282,7,324,2),
+(202231,202125,7,360,2),
+(202231,202203,7,36,2),
+(202231,201960,7,72,2);
+
+-- Remove a dupe spawn
+DELETE FROM `creature` WHERE `guid`=201998;
+DELETE FROM `creature_addon` WHERE `guid`=201998;
diff --git a/sql/old/3.3.5a/2012_05_10_00_world_sai.sql b/sql/old/3.3.5a/2012_05_10_00_world_sai.sql
new file mode 100644
index 00000000000..c6d6e914345
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_10_00_world_sai.sql
@@ -0,0 +1,42 @@
+-- [Q] See You on the Other Side
+
+-- Gan'jo SAI
+SET @ENTRY := 26924;
+SET @QUEST := 12121;
+SET @GOSSIP := 10220;
+SET @SPELL_RESURRECT := 61613;
+UPDATE `creature_template` SET `npcflag`=3,`AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,62,0,100,0,@GOSSIP,0,0,0,11,@SPELL_RESURRECT,1,0,0,0,0,7,0,0,0,0,0,0,0,"Gan'jo - On Gossip Select - Cast Ganjo Resurrection"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Gan'jo - On Gossip Select - Close Gossip");
+
+-- Essence of Warlord Jin'arrak SAI
+SET @ENTRY := 26902;
+SET @SPELL_DIE_EFFECT := 61611;
+SET @SPELL_CAMERA_SHAKE := 47533;
+UPDATE `creature_template` SET `AIName`='SmartAI',`flags_extra`=128 WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@ENTRY,@ENTRY*100) AND `source_type` IN (0,9);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,54,0,100,0,0,0,0,0,80,@ENTRY*100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Just Summoned - Run Script"),
+(@ENTRY*100,9,0,0,0,0,100,0,0,0,0,0,85,@SPELL_CAMERA_SHAKE,0,0,0,0,0,7,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Script - Invoker Cast Camera Shake - Small"),
+(@ENTRY*100,9,1,0,0,0,100,0,4000,4000,0,0,33,@ENTRY,0,0,0,0,0,7,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Script - Killed Monster Credit"),
+(@ENTRY*100,9,2,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Script - Monster Whisper Line 0"),
+(@ENTRY*100,9,3,0,0,0,100,0,0,0,0,0,85,@SPELL_CAMERA_SHAKE,0,0,0,0,0,7,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Script - Invoker Cast Camera Shake - Small"),
+(@ENTRY*100,9,4,0,0,0,100,0,3000,3000,0,0,85,@SPELL_DIE_EFFECT,0,0,0,0,0,7,0,0,0,0,0,0,0,"Essence of Warlord Jin'arrak - On Script - Invoker Cast On The Other Side");
+
+-- Essence of Warlord Jin'arrak text
+DELETE FROM `creature_text` WHERE `entry`=@ENTRY;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES 
+(@ENTRY,0,0,"How dare you summon me without an offering!",42,0,0,0,0,0,"Essence of Warlord Jin'arrak");
+
+-- Ganjo's Resurrection removes On The Other Side
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=@SPELL_RESURRECT;
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(@SPELL_RESURRECT,-@SPELL_DIE_EFFECT,1,"Ganjo's Resurrection removes On The Other Side");
+
+-- Conditions for Gan'jo's gossip option
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=@GOSSIP;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTarget`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`comment`) VALUES
+(15,@GOSSIP,0,0,0,1,@SPELL_DIE_EFFECT,0,"Ganjo's Gossip - requires aura See You On The Other Side"),
+(15,@GOSSIP,0,0,1,9,@QUEST,0,"Ganjo's Gossip - requires quest See You On The Other Side to be rewarded");
diff --git a/sql/old/3.3.5a/2012_05_10_01_world_misc.sql b/sql/old/3.3.5a/2012_05_10_01_world_misc.sql
new file mode 100644
index 00000000000..a7a30d518a2
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_10_01_world_misc.sql
@@ -0,0 +1,37 @@
+-- [Q] Leave Nothing to Chance
+
+-- Lower Wintergarde Mine Shaft and Upper Wintergarde Mine Shaft
+UPDATE `creature_template` SET `MovementType`=0,`flags_extra`=`flags_extra`|128 WHERE `entry`IN (27437,27436);
+UPDATE `creature` SET `MovementType`=0,`spawndist`=0 WHERE `id` IN (27437,27436);
+
+-- Wintergarde Mine Bomb SAI
+SET @ENTRY := 27435;
+SET @SPELL_EXPLOSION := 48742;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,1,0,100,1,14000,14000,0,0,11,@SPELL_EXPLOSION,2,0,0,0,0,1,0,0,0,0,0,0,0,"Wintergarde Mine Bomb - Out of Combat - Cast Wintergarde Mine Explosion"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,41,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wintergarde Mine Bomb - On Wintergarde Mine Explosion Cast - Forced Despawn");
+
+-- Spawn missing spell focus object for upper mine
+DELETE FROM `gameobject` WHERE `id`=188711 AND `guid`=370;
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
+(370,188711,571,1,1,3898.18,-881.748,119.533,0.421023,0,0,0.20896,0.977924,300,0,1);
+
+-- Spawn missing Upper Wintergarde Mine Shaft
+DELETE FROM `creature` WHERE `id`=27436 AND `guid`=42576;
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
+(42576,27436,571,1,1,0,0,3899.86,-883.613,119.536,0.0636665,300,0,0,42,0,0,0,0,0);
+
+-- Spellscriptname
+DELETE FROM `spell_script_names` WHERE `spell_id`=@SPELL_EXPLOSION;
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(@SPELL_EXPLOSION,'spell_q12277_wintergarde_mine_explosion');
+
+-- The conditions will make it works exactly like it should. Thanks a lot Josh.
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=@SPELL_EXPLOSION;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,@SPELL_EXPLOSION,0,31,3,27437,0,0,'',"Wintergarde Mine Explosion - Lower Wintergarde Mine Shaft"), -- Effect 0 - SPELL_EFFECT_DUMMY
+(13,1,@SPELL_EXPLOSION,1,31,3,27436,0,0,'',"Wintergarde Mine Explosion - Upper Wintergarde Mine Shaft"), -- Effect 0 - SPELL_EFFECT_DUMMY
+(13,2,@SPELL_EXPLOSION,0,31,4,0,0,0,'',"Wintergarde Mine Explosion - Targets Players"),                          -- Effect 1 - SPELL_EFFECT_KNOCK_BACK
+(13,4,@SPELL_EXPLOSION,0,31,5,188712,0,0,'',"Wintergarde Mine Explosion - Wintergarde Mine Cave In (2)");    -- Effect 2 - SPELL_EFFECT_ACTIVATE_OBJECT
diff --git a/sql/old/3.3.5a/2012_05_10_02_world_creature_template.sql b/sql/old/3.3.5a/2012_05_10_02_world_creature_template.sql
new file mode 100644
index 00000000000..28893f24fdf
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_10_02_world_creature_template.sql
@@ -0,0 +1,2 @@
+-- fix creauture_template loot id for infinite corruptor. could have sworn this was already in the db.
+UPDATE `creature_template` SET `lootid` = 0 WHERE `entry` IN (32313,32273);
diff --git a/sql/old/3.3.5a/2012_05_10_03_world_misc.sql b/sql/old/3.3.5a/2012_05_10_03_world_misc.sql
new file mode 100644
index 00000000000..339f52ac0bb
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_10_03_world_misc.sql
@@ -0,0 +1,129 @@
+ -- Remove obsolete requirement 'cooking profession' from quest 'Beer Basted Boar Ribs' (thx tifkat) closes #5198
+UPDATE `quest_template` SET `RequiredSkillId`=0, `RequiredSkillPoints`=0 WHERE `Id`=384;
+
+-- Fix proc for Death's Verdict/Choice (author: kandera) closes #6041
+UPDATE `spell_proc_event` SET `procFlags` = 0, `procEx` = `procEx`|262144 WHERE `entry` in (67702, 67771);
+
+-- Disables quest "Desperate Research" for all factions author trista closes #5285
+DELETE FROM `disables` WHERE `sourceType` = 1 AND `entry` in (12782,12783,12811,12784,12752,12775,12777,12753,12808,12772);
+INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES
+(1,12782,0,0,0,'Disable quest from Scourge Invasion for Blood Elves'),
+(1,12783,0,0,0,'Disable quest from Scourge Invasion for Orcs'),
+(1,12811,0,0,0,'Disable quest from Scourge Invasion for Trolls'),
+(1,12784,0,0,0,'Disable quest from Scourge Invasion for Tauren'),
+(1,12752,0,0,0,'Disable quest from Scourge Invasion for undead'),
+(1,12775,0,0,0,'Disable quest from Scourge Invasion for Human'),
+(1,12777,0,0,0,'Disable quest from Scourge Invasion for Draenei'),
+(1,12753,0,0,0,'Disable quest from Scourge Invasion for Dwarves'),
+(1,12808,0,0,0,'Disable quest from Scourge Invasion for Gnomes'),
+(1,12772,0,0,0,'Disable quest from Scourge Invasion for Night Elves');
+-- Disables scourge invasion connected quests listed below
+DELETE FROM `disables` WHERE `sourceType` = 1 AND `entry` in (12788,12812,12785,12786,12787,12774,12776,12771,12809,12773);
+INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES
+(1,12788,0,0,0,'Disable quest from Scourge Invasion for Blood Elves'),
+(1,12812,0,0,0,'Disable quest from Scourge Invasion for Orcs'),
+(1,12785,0,0,0,'Disable quest from Scourge Invasion for Trolls'),
+(1,12786,0,0,0,'Disable quest from Scourge Invasion for Tauren'),
+(1,12787,0,0,0,'Disable quest from Scourge Invasion for undead'),
+(1,12774,0,0,0,'Disable quest from Scourge Invasion for Human'),
+(1,12776,0,0,0,'Disable quest from Scourge Invasion for Draenei'),
+(1,12771,0,0,0,'Disable quest from Scourge Invasion for Dwarves'),
+(1,12809,0,0,0,'Disable quest from Scourge Invasion for Gnomes'),
+(1,12773,0,0,0,'Disable quest from Scourge Invasion for Night Elves');
+
+-- Limit Bloodgem Shard use to Netherstorm Cristal Target author: nelegalno closes #4165
+DELETE FROM `conditions` WHERE (`SourceEntry`=34367 AND `SourceTypeOrReferenceId`=17 AND `ConditionTypeOrReference`=29);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(17,0,34367,0,29,19421,15,0,64,'','Limit Bloodgem Shard use to Netherstorm Cristal Target');
+
+-- Path of xx and A Change of Heart (Ashen Band rings) author: studioworks closes #2544
+UPDATE `quest_template` SET `PrevQuestId`=0 WHERE `id` IN
+(24827,24834,24835,24823,24828,24829,25239,25240,25242,24826,24832,24833,24825,24830,24831,24819,24820,24821,24822,24836,24837,24838,24839,24840,24841,24842,24843,24844,24845,24846,24847,25246,25247,25248,25249);
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry` IN
+-- Paths
+(24827,24834,24835,24823,24828,24829,25239,25240,25242,24826,24832,24833,24825,24830,24831,
+-- A Change of Heart
+24819,24820,24821,24822,24836,24837,24838,24839,24840,24841,24842,24843,24844,24845,24846,24847,25246,25247,25248,25249);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`Comment`) VALUES
+-- Path of Courage
+(19,0,24827,0,2,50375,1,0,'Path of Courage 1'),
+(19,0,24834,0,2,50388,1,0,'Path of Courage 2'),
+(19,0,24835,0,2,50403,1,0,'Path of Courage 3'),
+-- Path of Destruction
+(19,0,24823,0,2,50384,1,0,'Path of Destruction 1'),
+(19,0,24828,0,2,50377,1,0,'Path of Destruction 2'),
+(19,0,24829,0,2,50397,1,0,'Path of Destruction 3'),
+-- Path of Might
+(19,0,25239,0,2,52569,1,0,'Path of Might 1'),
+(19,0,25240,0,2,52570,1,0,'Path of Might 2'),
+(19,0,25242,0,2,52571,1,0,'Path of Might 3'),
+-- Path of Vengeance
+(19,0,24826,0,2,50376,1,0,'Path of Vengeance 1'),
+(19,0,24832,0,2,50387,1,0,'Path of Vengeance 2'),
+(19,0,24833,0,2,50401,1,0,'Path of Vengeance 3'),
+-- Path of Wisdom
+(19,0,24825,0,2,50378,1,0,'Path of Wisdom 1'),
+(19,0,24830,0,2,50386,1,0,'Path of Wisdom 2'),
+(19,0,24831,0,2,50399,1,0,'Path of Wisdom 3'),
+-- A Change of Heart
+(19,0,24819,0,2,50377,1,0,'A Change of Heart'),
+(19,0,24820,0,2,50376,1,0,'A Change of Heart'),
+(19,0,24821,0,2,50375,1,0,'A Change of Heart'),
+(19,0,24822,0,2,50378,1,0,'A Change of Heart'),
+(19,0,24836,0,2,50384,1,0,'A Change of Heart'),
+(19,0,24837,0,2,50386,1,0,'A Change of Heart'),
+(19,0,24838,0,2,50387,1,0,'A Change of Heart'),
+(19,0,24839,0,2,50388,1,0,'A Change of Heart'),
+(19,0,24840,0,2,50397,1,0,'A Change of Heart'),
+(19,0,24841,0,2,50399,1,0,'A Change of Heart'),
+(19,0,24842,0,2,50401,1,0,'A Change of Heart'),
+(19,0,24843,0,2,50403,1,0,'A Change of Heart'),
+(19,0,24844,0,2,50398,1,0,'A Change of Heart'),
+(19,0,24845,0,2,50400,1,0,'A Change of Heart'),
+(19,0,24846,0,2,50402,1,0,'A Change of Heart'),
+(19,0,24847,0,2,50404,1,0,'A Change of Heart'),
+(19,0,25246,0,2,52572,1,0,'A Change of Heart'),
+(19,0,25247,0,2,52569,1,0,'A Change of Heart'),
+(19,0,25248,0,2,52570,1,0,'A Change of Heart'),
+(19,0,25249,0,2,52571,1,0,'A Change of Heart');
+
+-- spawn farmer torp author: zxbiohazardzx closes #6256
+SET @guid := 42652; 
+DELETE FROM `creature` WHERE `guid`=@guid;
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`)
+VALUES
+(@guid,25607,571,1,1,2886.325,6385.55,92.96985,1.4512,120); -- Farmer Torp
+
+-- Disgusting Oozeling aura author: gecko32 closes #6197
+UPDATE `creature_template_addon` SET `auras`='25163' WHERE `entry`=15429;
+-- Mr. Chilly
+-- Add aura chilly for Periodic slide
+DELETE FROM `creature_template_addon` WHERE `entry`=29726;
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES 
+(29726, 0, 0, 0, 0, 0, '61811');
+
+-- Update to Change <name> to $n in page text author: gecko32 closes #5930
+UPDATE `page_text` SET `text`='This proof of deed is to verify that $n slew Margol the Rager, scourge of the searing gorge.$B$BThe Ironforge museum recognizes this achievement and thanks the bearer for their generous contribution.$B$B-Head Curator Thorius Stonetender' WHERE `entry`=1231;
+
+-- Update frost shock and you to only be for shamans. author: whit33r closes #4727
+UPDATE `quest_template` SET `RequiredClasses`=64 WHERE `id` = 7505;
+
+-- fixes ashen band of destruction proc author: kandera
+DELETE FROM `spell_proc_event` WHERE `entry` = 72417;
+INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES
+(72417,0,0,0,0,0,327680,0,0,0,60);
+
+-- fixes quest credit from Fel reaver no thanks! author: tREAk & shlomi1515 closes #3715
+UPDATE `spell_dbc` SET `Effect1`=16,`EffectMiscValue1`=10855 WHERE `id`=38758;
+DELETE FROM `creature_ai_scripts` WHERE creature_id=22293;
+
+-- fix areatrigger for wickerman camp author: boomper closes #3549
+DELETE FROM `areatrigger_involvedrelation` WHERE `id` =3991;
+INSERT INTO `areatrigger_involvedrelation` (`id`, `quest`) 
+VALUES (3991,1658);
+
+-- yous have da darkrune should be daily author: kaelima closes #3457
+UPDATE `quest_template` SET `SpecialFlags` = `SpecialFlags` | 1 WHERE `id` = 11027;
+
+-- fix infinite corruptor loot id author: vincent-michael
+UPDATE `creature_template` SET `lootid` = 32313 WHERE `entry` =32313;
diff --git a/sql/old/3.3.5a/2012_05_10_04_world_ceature_sai.sql b/sql/old/3.3.5a/2012_05_10_04_world_ceature_sai.sql
new file mode 100644
index 00000000000..5f01e951c4b
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_10_04_world_ceature_sai.sql
@@ -0,0 +1,14 @@
+-- Spawn Disturbed Glacial Revenant
+DELETE FROM `creature` WHERE `guid`=201998;
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`, `position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
+(201998,36874,658,2,1,0,0,1053.894,-93.05556,632.8575,4.223697,86400,0,0,1,0,0,0,0,0);
+DELETE FROM `creature_addon` WHERE `guid`=201998;
+INSERT INTO `creature_addon` (`guid`,`bytes2`) VALUES
+(201998,1);
+
+-- Disturbed Glacial Revenant SAI
+SET @ENTRY := 36874; -- NPC entry
+UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,4,0,0,12000,15000,11,55216,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Disturbed Glacial Revenant - Combat - Cast Avalanche');
diff --git a/sql/old/3.3.5a/2012_05_10_05_world_waypoints.sql b/sql/old/3.3.5a/2012_05_10_05_world_waypoints.sql
new file mode 100644
index 00000000000..1677d74c4a7
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_10_05_world_waypoints.sql
@@ -0,0 +1,88 @@
+-- Deathwhisper Necrolyte pathing
+SET @NPC := 202103;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,555.3976,303.5347,507.6232,0,0,0,100,0),
+(@PATH,2,568.4896,297.9913,506.9572,0,0,0,100,0),
+(@PATH,3,586.1476,292.5486,506.3322,0,0,0,100,0),
+(@PATH,4,598.5833,292.6007,506.3322,0,0,0,100,0),
+(@PATH,5,602.3438,300.2135,506.9457,0,0,0,100,0),
+(@PATH,6,603.0573,307.5399,507.6957,0,0,0,100,0),
+(@PATH,7,611.7239,316.1129,508.4457,0,0,0,100,0),
+(@PATH,8,620.0677,312.684,508.1957,0,0,0,100,0),
+(@PATH,9,622.184,305.0868,508.3207,0,0,0,100,0),
+(@PATH,10,616.684,295.2083,507.8819,0,0,0,100,0),
+(@PATH,11,613.9236,287.4288,507.0737,0,0,0,100,0),
+(@PATH,12,618.5174,272.882,507.6097,0,0,0,100,0),
+(@PATH,13,621.4445,263.4861,507.9438,0,0,0,100,0),
+(@PATH,14,618.5174,272.882,507.6097,0,0,0,100,0),
+(@PATH,15,613.9236,287.4288,507.0737,0,0,0,100,0),
+(@PATH,16,616.684,295.2083,507.8819,0,0,0,100,0),
+(@PATH,17,622.184,305.0868,508.3207,0,0,0,100,0),
+(@PATH,18,620.0677,312.684,508.1,0,0,0,100,0),
+(@PATH,19,611.7239,316.1129,508.4457,0,0,0,100,0),
+(@PATH,20,603.0573,307.5399,507.6629,0,0,0,100,0),
+(@PATH,21,602.3438,300.2135,506.8405,0,0,0,100,0),
+(@PATH,22,598.5833,292.6007,506.3498,0,0,0,100,0),
+(@PATH,23,586.1476,292.5486,506.3322,0,0,0,100,0),
+(@PATH,24,568.4896,297.9913,506.9572,0,0,0,100,0);
+DELETE FROM `creature_formations` WHERE `leaderGUID`=@NPC;
+INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES
+(@NPC,@NPC,0,0,2),
+(@NPC,201819,7,270,2),
+(@NPC,201934,7,306,2),
+(@NPC,202121,7,342,2),
+(@NPC,202196,7,18,2),
+(@NPC,202098,7,54,2),
+(@NPC,201954,7,90,2);
+
+-- Deathwhisper Necrolyte pathing
+SET @NPC := 202273;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+UPDATE `creature` SET `position_x`=611.9375,`position_y`=117.441,`position_z`=508.0308 WHERE `guid` IN (202273,202054,201845,201914,202145,202227,201988);
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,611.9375,117.441,508.0308,0,0,0,100,0),
+(@PATH,2,620.9531,139.3004,506.531,0,0,0,100,0),
+(@PATH,3,624.3854,153.9531,507.3376,0,0,0,100,0),
+(@PATH,4,625.8316,167.6233,507.4478,0,0,0,100,0),
+(@PATH,5,622.8368,183.6788,507.7706,0,0,0,100,0),
+(@PATH,6,625.8316,167.6233,507.4478,0,0,0,100,0),
+(@PATH,7,624.3854,153.9531,507.3376,0,0,0,100,0),
+(@PATH,8,620.9531,139.3004,506.531,0,0,0,100,0),
+(@PATH,9,611.9375,117.441,508.0308,0,0,0,100,0),
+(@PATH,10,610.8828,99.47656,510.0737,0,0,0,100,0);
+DELETE FROM `creature_formations` WHERE `leaderGUID`=@NPC;
+INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES
+(@NPC,@NPC,0,0,2),
+(@NPC,202054,7,270,2),
+(@NPC,201845,7,306,2),
+(@NPC,201914,7,342,2),
+(@NPC,202145,7,18,2),
+(@NPC,202227,7,54,2),
+(@NPC,201988,7,90,2);
+
+-- Fix previous creature removal
+DELETE FROM `creature` WHERE `id`=42160;
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`, `position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES
+(42160,36881,658,3,1,0,0,592.975,176.104,510.1582,508.746,86400,0,0,1,0,0);
+UPDATE `creature` SET `position_x`=611.9375,`position_y`=117.441,`position_z`=508.0308 WHERE `guid` IN (202273,202054,201845,201914,202145,202227,201988);
+DELETE FROM `creature_formations` WHERE `leaderGUID`=202231;
+INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES
+(202231,202231,0,0,2),
+(202231,202099,7,270,2),
+(202231,202282,7,306,2),
+(202231,202125,7,342,2),
+(202231,202203,7,18,2),
+(202231,201960,7,54,2),
+(202231,42160,7,90,2);
+
+-- Update Scourgelord Tyrannus "Make him fly"
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=36794;
diff --git a/sql/old/3.3.5a/2012_05_10_06_world_waypoints.sql b/sql/old/3.3.5a/2012_05_10_06_world_waypoints.sql
new file mode 100644
index 00000000000..6fd04d0e4da
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_10_06_world_waypoints.sql
@@ -0,0 +1,40 @@
+-- Deathwhisper Necrolyte pathing
+SET @NPC := 202063;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+UPDATE `creature` SET `position_x`=631.8229,`position_y`=229.7292,`position_z`=508.0604 WHERE `guid` IN (202028,202000,201957,201820,202122,202199);
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,631.8229,229.7292,508.0604,0,0,0,100,0),
+(@PATH,2,643.8733,215.2674,508.2268,0,0,0,100,0),
+(@PATH,3,659.0139,215.9635,507.8518,0,0,0,100,0),
+(@PATH,4,674.184,213.5833,508.8467,0,0,0,100,0),
+(@PATH,5,678.8004,201.066,508.4717,0,0,0,100,0),
+(@PATH,6,662.4636,183.0694,507.9585,0,0,0,100,0),
+(@PATH,7,650.8941,171.5642,507.7085,0,0,0,100,0),
+(@PATH,8,637.7292,155.2569,507.9196,0,0,0,100,0),
+(@PATH,9,644.6389,130.2639,510.4212,0,0,0,100,0),
+(@PATH,10,654.9896,121.3038,511.9212,0,0,0,100,0),
+(@PATH,11,677.7448,136.6528,512.7715,0,0,0,100,0),
+(@PATH,12,678.2847,149.1233,507.8965,0,0,0,100,0),
+(@PATH,13,677.7448,136.6528,512.7715,0,0,0,100,0),
+(@PATH,14,654.9896,121.3038,511.9212,0,0,0,100,0),
+(@PATH,15,644.6389,130.2639,510.4212,0,0,0,100,0),
+(@PATH,16,637.7292,155.2569,507.9196,0,0,0,100,0),
+(@PATH,17,650.8941,171.5642,507.7085,0,0,0,100,0),
+(@PATH,18,662.4636,183.0694,507.9585,0,0,0,100,0),
+(@PATH,19,678.8004,201.066,508.4717,0,0,0,100,0),
+(@PATH,20,674.184,213.5833,508.8467,0,0,0,100,0),
+(@PATH,21,659.0139,215.9635,507.8518,0,0,0,100,0),
+(@PATH,22,643.8733,215.2674,508.2268,0,0,0,100,0);
+DELETE FROM `creature_formations` WHERE `leaderGUID`=@NPC;
+INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES
+(@NPC,@NPC,0,0,2),
+(@NPC,202028,7,270,2),
+(@NPC,202000,7,306,2),
+(@NPC,201957,7,342,2),
+(@NPC,201820,7,18,2),
+(@NPC,202122,7,54,2),
+(@NPC,202199,7,90,2);
diff --git a/sql/old/3.3.5a/2012_05_11_00_world_waypoints.sql b/sql/old/3.3.5a/2012_05_11_00_world_waypoints.sql
new file mode 100644
index 00000000000..fa4e18f6468
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_11_00_world_waypoints.sql
@@ -0,0 +1,31 @@
+-- Scourgelord Tyrannus pathing
+SET @NPC := 201951;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `position_x`=873.783,`position_y`=136.9774,`position_z`=623.6115,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`) VALUES (@NPC,@PATH,50331648,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE
+(@PATH,1,873.783,136.9774,623.6115,0,0,0,100,0),
+(@PATH,2,872.9045,139.2743,622.4446,0,0,0,100,0),
+(@PATH,3,888.7917,171.3403,591.3615,0,0,0,100,0),
+(@PATH,4,861.3073,209.8455,591.3615,0,0,0,100,0),
+(@PATH,5,830.4913,254.5556,591.3615,0,0,0,100,0),
+(@PATH,6,780.4844,277.6406,591.3615,0,0,0,100,0),
+(@PATH,7,732.6771,272.4635,591.3615,0,0,0,100,0),
+(@PATH,8,683.9028,265.276,591.3615,0,0,0,100,0),
+(@PATH,9,612.3368,284.7934,553.4998,0,0,0,100,0),
+(@PATH,10,554.816,303.1858,553.4998,0,0,0,100,0),
+(@PATH,11,498.1024,309.0625,553.4998,0,0,0,100,0),
+(@PATH,12,470.4167,230.0174,553.4998,0,0,0,100,0),
+(@PATH,13,454.0087,175.2135,553.4998,0,0,0,100,0),
+(@PATH,14,492.4288,127.1806,583.1108,0,0,0,100,0),
+(@PATH,15,551.2604,121.6354,583.1108,0,0,0,100,0),
+(@PATH,16,647.5573,126.3542,583.1108,0,0,0,100,0),
+(@PATH,17,766.2222,130.9254,583.1108,0,0,0,100,0),
+(@PATH,18,829.408,42.33854,583.1108,0,0,0,100,0),
+(@PATH,19,746.7101,-53.03299,583.1108,0,0,0,100,0),
+(@PATH,20,663.2379,-77.32291,583.1108,0,0,0,100,0),
+(@PATH,21,618.6389,3.369792,583.1108,0,0,0,100,0),
+(@PATH,22,641.8559,89.27604,583.1108,0,0,0,100,0),
+(@PATH,23,794.1667,115.6858,583.1108,0,0,0,100,0);
diff --git a/sql/old/3.3.5a/2012_05_11_01_world_gameobject_template.sql b/sql/old/3.3.5a/2012_05_11_01_world_gameobject_template.sql
new file mode 100644
index 00000000000..630a166276b
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_11_01_world_gameobject_template.sql
@@ -0,0 +1,4 @@
+-- Lock Ice Wall and make untargetable
+UPDATE `gameobject_template` SET `flags`=18 WHERE `entry`=201885;
+-- Saronite Rock Should be untargetable
+UPDATE `gameobject_template` SET `flags`=18 WHERE `entry`=196485;
diff --git a/sql/old/3.3.5a/2012_05_11_02_world_conditions.sql b/sql/old/3.3.5a/2012_05_11_02_world_conditions.sql
new file mode 100644
index 00000000000..a10c27a0ef5
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_11_02_world_conditions.sql
@@ -0,0 +1,23 @@
+-- Spell Conditions for spell Necromantic Power 69347
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=69347;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,69347,0,31,3,37496,0,0,'','Spell 69347 targets entry 37496'),
+(13,1,69347,1,31,3,37497,0,0,'','Spell 69347 targets entry 37497'),
+(13,1,69347,2,31,3,37498,0,0,'','Spell 69347 targets entry 37498'),
+(13,1,69347,3,31,3,37584,0,0,'','Spell 69347 targets entry 37584'),
+(13,1,69347,4,31,3,37587,0,0,'','Spell 69347 targets entry 37587'),
+(13,1,69347,5,31,3,37588,0,0,'','Spell 69347 targets entry 37588');
+
+-- Spell Conditions for spell Shriek of the Highborne 70512
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=70512;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,70512,3,31,3,37584,0,0,'','Spell 70512 targets entry 37584'),
+(13,1,70512,4,31,3,37587,0,0,'','Spell 70512 targets entry 37587'),
+(13,1,70512,5,31,3,37588,0,0,'','Spell 70512 targets entry 37588');
+
+-- Spell Conditions for spell Empowered Blizzard 70130
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=70130;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,70130,0,31,3,37496,0,0,'','Spell 70130 targets entry 37496'),
+(13,1,70130,1,31,3,37497,0,0,'','Spell 70130 targets entry 37497'),
+(13,1,70130,2,31,3,37498,0,0,'','Spell 70130 targets entry 37498');
diff --git a/sql/old/3.3.5a/2012_05_12_00_world_gameobject_template.sql b/sql/old/3.3.5a/2012_05_12_00_world_gameobject_template.sql
new file mode 100644
index 00000000000..ffa932c8640
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_12_00_world_gameobject_template.sql
@@ -0,0 +1,2 @@
+-- Lock Halls of Reflection Portcullis
+UPDATE `gameobject_template` SET `flags`=18 WHERE `entry`=201848;
diff --git a/sql/old/3.3.5a/2012_05_12_01_world_item_loot_template.sql b/sql/old/3.3.5a/2012_05_12_01_world_item_loot_template.sql
new file mode 100644
index 00000000000..052b749c48c
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_12_01_world_item_loot_template.sql
@@ -0,0 +1,92 @@
+DELETE FROM `item_loot_template` WHERE `entry` BETWEEN 51999 AND 52005;
+INSERT INTO `item_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+-- Satchel of Helpfull Goods (level 0-25)
+(51999,51964,0,1,1,1,1), -- Vigorous Belt
+(51999,51968,0,1,1,1,1), -- Enumerated Wrap
+(51999,51978,0,1,1,1,1), -- Earthbound Girdle
+(51999,51994,25,1,1,1,1), -- Tumultuous Cloak
+-- Satchel of Helpfull Goods (level 26-35)
+(52000,51965,0,1,1,1,1), -- Vigorous Handguards
+(52000,51973,0,1,1,1,1), -- Enumerated Handwraps
+(52000,51980,0,1,1,1,1), -- Earthbound Handgrips
+(52000,51996,25,1,1,1,1), -- Tumultuous Necklace
+-- Satchel of Helpfull Goods (level 36-45)
+(52001,51966,0,1,1,1,1), -- Vigorous Spaulders
+(52001,51974,0,1,1,1,1), -- Enumerated Shoulderpads
+(52001,51976,0,1,1,1,1), -- Earthbound Shoulderguards
+(52001,51984,0,1,1,1,1), -- Stalwart Shoulderpads
+(52001,51992,25,1,1,1,1), -- Tumultuous Ring
+-- Satchel of Helpfull Goods (level 46-55)
+(52002,51962,0,1,1,1,1), -- Vigorous Bracers
+(52002,51963,0,1,1,1,1), -- Vigorous Stompers
+(52002,51967,0,1,1,1,1), -- Enumerated Sandals
+(52002,51972,0,1,1,1,1), -- Enumerated Bracers
+(52002,51981,0,1,1,1,1), -- Earthbound Wristguards
+(52002,51982,0,1,1,1,1), -- Earthbound Boots
+(52002,51989,0,1,1,1,1), -- Stalwart Bands
+(52002,51990,0,1,1,1,1), -- Stalwart Treads
+-- Satchel of Helpfull Goods (level 56-60)
+(52003,51959,0,1,1,1,1), -- Vigorous Belt
+(52003,51971,0,1,1,1,1), -- Enumerated Belt
+(52003,51977,0,1,1,1,1), -- Earthbound Girdle
+(52003,51985,0,1,1,1,1), -- Stalwart Belt
+(52003,51993,25,1,1,1,1), -- Turbulent Cloak
+-- Satchel of Helpfull Goods (level 61-64)
+(52004,51960,0,1,1,1,1), -- Vigorous Gloves
+(52004,51970,0,1,1,1,1), -- Enumerated Gloves
+(52004,51979,0,1,1,1,1), -- Earthbound Grips
+(52004,51987,0,1,1,1,1), -- Stalwart Grips
+(52004,51995,25,1,1,1,1), -- Turbulent Necklace
+-- Satchel of Helpfull Goods (level 65-70)
+(52005,51961,0,1,1,1,1), -- Vigorous Shoulderguards
+(52005,51969,0,1,1,1,1), -- Enumerated Shoulders
+(52005,51975,0,1,1,1,1), -- Earthbound Shoulders
+(52005,51983,0,1,1,1,1), -- Stalwart Shoulderguards
+(52005,51991,25,1,0,1,1); -- Turbulent Signet
+-- -------------------------------------------------------------------
+-- Set some Parameters
+-- -------------------------------------------------------------------
+SET @Cloth := 400; -- Class Bitmask: 16 (Priest) +128 (Mage) +256 (Warlock)
+SET @Leather1 := 1100; -- Class Bitmask: 4 (Hunter) +8 (Rogue) +64 (Shaman) +1024 (Druid)
+SET @Leather2 := 1032; -- Class Bitmask: 8 (Rogue) +1024 (Druid)
+SET @Mail1 := 3; -- Class Bitmask: 1 (Warrior) +2 (Paladin)
+SET @Mail2 := 68; -- Class Bitmask: 4 (Hunter) +8 (Shaman)
+SET @Plate := 35; -- Class Bitmask: 1 (Warrior) +2 (Paladin) +32 (DeathKnight)
+-- Add conditions to make sure everyone gets beneficial loot for their class
+-- -------------------------------------------------------------------
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=5 AND `SourceGroup` BETWEEN 51999 AND 52005 ;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+-- Cloth Items
+(5,51999,51968,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Wrap only for clothusers'),
+(5,52000,51973,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Handwraps only for clothusers'),
+(5,52001,51974,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Shoulderpads only for clothusers'),
+(5,52002,51967,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Sandals only for clothusers'),
+(5,52002,51972,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Bracers only for clothusers'),
+(5,52003,51971,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Belt only for clothusers'),
+(5,52004,51970,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Gloves only for clothusers'),
+(5,52005,51969,0,0,15,0,@Cloth,0,0,0,0,'','SOHG: Enumerated Shoulders only for clothusers'),
+-- Leather Items
+(5,51999,51964,0,0,15,0,@Leather1,0,0,0,0,'','SOHG: Vigorous Belt only for leatherusers'),
+(5,52000,51965,0,0,15,0,@Leather1,0,0,0,0,'','SOHG: Vigorous Handguards only for leatherusers'),
+(5,52001,51966,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Spaulders only for leatherusers'),
+(5,52002,51962,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Bracers only for leatherusers'),
+(5,52002,51963,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Stompers only for leatherusers'),
+(5,52003,51959,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Belt only for leatherusers'),
+(5,52004,51960,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Gloves only for leatherusers'),
+(5,52005,51961,0,0,15,0,@Leather2,0,0,0,0,'','SOHG: Vigorous Shoulderguards only for leatherusers'),
+-- Mail Items
+(5,51999,51978,0,0,15,0,@Mail1,0,0,0,0,'','SOHG: Earthbound Girdle only for mail users'),
+(5,52000,51980,0,0,15,0,@Mail1,0,0,0,0,'','SOHG: Earthbound Handgrips only for mail users'),
+(5,52001,51976,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Shoulderguards only for mail users'),
+(5,52002,51982,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Boots only for mail users'),
+(5,52002,51981,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Wristguards only for mail users'),
+(5,52003,51977,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Girdle only for mail users'),
+(5,52004,51979,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Grips only for mail users'),
+(5,52005,51975,0,0,15,0,@Mail2,0,0,0,0,'','SOHG: Earthbound Shoulders only for mail users'),
+-- Plate Items
+(5,52001,51984,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Shoulderpads only for plate users'),
+(5,52002,51989,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Bands only for plate users'),
+(5,52002,51990,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Treads only for plate users'),
+(5,52003,51985,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Belt only for plate users'),
+(5,52004,51987,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Grips only for plate users'),
+(5,52005,51983,0,0,15,0,@Plate,0,0,0,0,'','SOHG: Stalwart Shoulderguards only for plate users');
diff --git a/sql/old/3.3.5a/2012_05_12_02_world_gameobject_loot_template.sql b/sql/old/3.3.5a/2012_05_12_02_world_gameobject_loot_template.sql
new file mode 100644
index 00000000000..b1f445faa59
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_12_02_world_gameobject_loot_template.sql
@@ -0,0 +1,37 @@
+-- Add Reference Loots
+SET @RefNormal := 35091;
+SET @RefHeroic := 35092;
+DELETE FROM `reference_loot_template` WHERE `entry` IN (@RefNormal,@RefHeroic);
+INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+-- Normal Loot
+(@RefNormal,49839,0,1,1,1,1), -- Mourning Malice
+(@RefNormal,49840,0,1,1,1,1), -- Hate-Forged Cleaver
+(@RefNormal,49841,0,1,1,1,1), -- Blackened Geist Ribs
+(@RefNormal,49842,0,1,1,1,1), -- Tapestry of the Frozen Throne
+(@RefNormal,49843,0,1,1,1,1), -- Crystalline Citadel Gauntlets
+(@RefNormal,49844,0,1,1,1,1), -- Crypt Fiend Slayer
+(@RefNormal,49845,0,1,1,1,1), -- Bone Golem Scapula
+(@RefNormal,49846,0,1,1,1,1), -- Chilled Heart of the Glacier
+(@RefNormal,49847,0,1,1,1,1), -- Legguards of Untimely Demise
+(@RefNormal,49848,0,1,1,1,1), -- Grim Lasher Shoulderguards
+(@RefNormal,49849,0,1,1,1,1), -- Tattered Glacial-Woven Hood
+(@RefNormal,49851,0,1,1,1,1), -- Greathelm of the Silver Hand
+-- Heroic Loot
+(@RefHeroic,50303,0,1,1,1,1), -- Black Icicle
+(@RefHeroic,50302,0,1,1,1,1), -- Liar's Tongue
+(@RefHeroic,50311,0,1,1,1,1), -- Second Helm of the Executioner
+(@RefHeroic,50312,0,1,1,1,1), -- Chestguard of Broken Branches
+(@RefHeroic,50310,0,1,1,1,1), -- Fossilized Ammonite Choker
+(@RefHeroic,50313,0,1,1,1,1), -- Oath of Empress Zoe
+(@RefHeroic,50309,0,1,1,1,1), -- Shriveled Heart
+(@RefHeroic,50314,0,1,1,1,1), -- Strip of Remorse
+(@RefHeroic,50308,0,1,1,1,1), -- Blighted Leather Footpads
+(@RefHeroic,50305,0,1,1,1,1), -- Grinning Skull Boots
+(@RefHeroic,50306,0,1,1,1,1), -- The Lady's Promise
+(@RefHeroic,50304,0,1,1,1,1); -- Hoarfrost Gauntlets
+-- Assign to the chest
+DELETE FROM `gameobject_loot_template` WHERE `entry` IN (27985,27993);
+INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(27985,1,100,1,0,-@RefNormal,2), -- Two from Normal Reference Loot 
+(27993,1,100,1,0,-@RefHeroic,2), -- Two from Heroic Reference Loot
+(27993,43102,85,1,0,1,1); -- Frozen Orb
diff --git a/sql/old/3.3.5a/2012_05_13_00_world_creature_text.sql b/sql/old/3.3.5a/2012_05_13_00_world_creature_text.sql
new file mode 100644
index 00000000000..8d083156fb0
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_13_00_world_creature_text.sql
@@ -0,0 +1,13 @@
+-- NPC talk text insert from sniff
+DELETE FROM `creature_text` WHERE `entry`=36494;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(36494,0,0, 'Tiny creatures under feet, you bring Garfrost something good to eat!',14,0,100,0,0,0, 'Forgemaster Garfrost'),
+(36494,1,0, 'Axe too weak. Garfrost make better and CRUSH YOU.',14,0,100,0,0,0, 'Forgemaster Garfrost'),
+(36494,2,0, 'Garfrost tired of puny mortals. Now your bones will freeze!',14,0,100,0,0,0, 'Forgemaster Garfrost'),
+(36494,3,0, 'Garfrost hope giant underpants clean. Save boss great shame. For later.',14,0,100,0,0,0, 'Forgemaster Garfrost'),
+(36494,4,0, 'Will save for snack. For later.',12,0,100,0,0,0, 'Forgemaster Garfrost'),
+(36494,4,1, 'That one maybe not so good to eat now. Stupid Garfrost! BAD! BAD!',12,0,100,0,0,0, 'Forgemaster Garfrost'),
+(36494,5,0, '%s hurls a massive saronite boulder at you!',16,0,100,0,0,0, 'Forgemaster Garfrost'),
+(36494,6,0, '%s casts |cFF00AACCDeep Freeze|r at $n.',41,0,100,0,0,0, 'Forgemaster Garfrost');
+-- Remove old script text
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1658006 AND -1658001;
diff --git a/sql/old/3.3.5a/2012_05_13_01_world_creature_text.sql b/sql/old/3.3.5a/2012_05_13_01_world_creature_text.sql
new file mode 100644
index 00000000000..8e983fd9a73
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_13_01_world_creature_text.sql
@@ -0,0 +1,14 @@
+-- NPC talk text insert for Sara
+DELETE FROM `creature_text` WHERE `entry`=33134;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(33134,0,0, 'Help me! Please get them off me!',14,0,100,0,0,15771, 'Sara YELL_PREFIGHT'),
+(33134,0,1, 'What do you want from me? Leave me alone!',14,0,100,0,0,15772, 'Sara YELL_PREFIGHT'),
+(33134,1,0, 'Yes! YES! Show them no mercy! Give no pause to your attacks!',14,0,100,0,0,15773, 'Sara YELL_COMBAT_PHASE_1'),
+(33134,1,1, 'Let hatred and rage guide your blows!',14,0,100,0,0,15774, 'Sara YELL_COMBAT_PHASE_1'),
+(33134,1,2, 'The time to strike at the head of the beast will soon be upon us! Focus your anger and hatred on his minions!',14,0,100,457,0,15775, 'Sara YELL_COMBAT_PHASE_1'),
+(33134,2,0, 'Suffocate upon your own hate!',14,0,100,0,0,15776, 'Sara YELL_COMBAT_PHASE_2'),
+(33134,2,1, 'Tremble, mortals, before the coming of the end!',14,0,100,0,0,15777, 'Sara YELL_COMBAT_PHASE_2'),
+(33134,3,0, 'Powerless to act...',14,0,100,0,0,15778, 'Sara YELL_SLAY'),
+(33134,3,1, 'Could they have been saved?',14,0,100,0,0,15779, 'YELL SAY_SLAY');
+-- remove script text
+DELETE FROM script_texts WHERE entry BETWEEN -1603319 AND -1603310;
diff --git a/sql/old/3.3.5a/2012_05_16_00_world_scripts.sql b/sql/old/3.3.5a/2012_05_16_00_world_scripts.sql
new file mode 100644
index 00000000000..9997c09bd8d
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_16_00_world_scripts.sql
@@ -0,0 +1,2 @@
+-- Add script to Dragonspire Hall Runes "UBRS"
+UPDATE `gameobject_template` SET `ScriptName`= 'go_dragonspire_hall_rune' WHERE `entry` BETWEEN 175194 AND 175200;
diff --git a/sql/old/3.3.5a/2012_05_17_00_world_creature_text.sql b/sql/old/3.3.5a/2012_05_17_00_world_creature_text.sql
new file mode 100644
index 00000000000..d7df0f94c0b
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_17_00_world_creature_text.sql
@@ -0,0 +1,7 @@
+-- NPC talk text insert from sniff
+DELETE FROM `creature_text` WHERE `entry`=9816;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(9816,0,0, '%s begins to regain its strength!',16,0,100,0,0,0, 'Pyroguard Emberseer'),
+(9816,1,0, '%s is nearly at full strength!',16,0,100,0,0,0, 'Pyroguard Emberseer'),
+(9816,2,0, '%s regains its power and breaks free of its bonds!',16,0,100,0,0,0, 'Pyroguard Emberseer'),
+(9816,3,0, 'Ha! Ha! Ha! Thank you for freeing me, fools. Now let me repay you by charring the flesh from your bones.',14,0,100,0,0,0, 'Pyroguard Emberseer');
diff --git a/sql/old/3.3.5a/2012_05_18_00_world_conditions.sql b/sql/old/3.3.5a/2012_05_18_00_world_conditions.sql
new file mode 100644
index 00000000000..ad18a6c65ef
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_18_00_world_conditions.sql
@@ -0,0 +1,3 @@
+DELETE FROM `conditions` WHERE `SourceEntry` = 52264;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,0,52264,0,0,29,0,28653,5,0,0,97,"","Creature conditions for spell 52264 (Deliver stolen horse)");
diff --git a/sql/old/3.3.5a/2012_05_18_01_world_misc.sql b/sql/old/3.3.5a/2012_05_18_01_world_misc.sql
new file mode 100644
index 00000000000..bded6fae447
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_18_01_world_misc.sql
@@ -0,0 +1,7 @@
+DELETE FROM `spell_proc_event` WHERE `entry` = 70656;
+
+UPDATE `quest_template` SET `NextQuestId` = 3761 WHERE `id` IN (936,3784,3762);
+
+DELETE FROM `spell_proc_event` WHERE `entry` = 63611;
+INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFamilyMask0`,`SpellFamilyMask1`,`SpellFamilyMask2`,`procFlags`,`procEx`,`ppmRate`,`CustomChance`,`Cooldown`) VALUES
+(63611,0,0,0,0,0,51154,0,0,0,0);
diff --git a/sql/old/3.3.5a/2012_05_18_01_world_spell_target_position.sql b/sql/old/3.3.5a/2012_05_18_01_world_spell_target_position.sql
new file mode 100644
index 00000000000..72ebc409d9d
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_18_01_world_spell_target_position.sql
@@ -0,0 +1,9 @@
+DELETE FROM `spell_target_position` WHERE `id` IN (30719,53140,53141,53360,54406,68328,71512);
+INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES
+(30719,571,5807.75,588.347,661.505,1.663),
+(53140,571,5807.75,588.347,661.505,1.663),
+(53141,571,5807.75,588.347,661.505,1.663),
+(53360,571,5807.75,588.347,661.505,1.663),
+(54406,571,5807.75,588.347,661.505,1.663),
+(68328,571,5807.75,588.347,661.505,1.663),
+(71512,571,5807.75,588.347,661.505,1.663);
diff --git a/sql/old/3.3.5a/2012_05_19_00_world_quest_template.sql b/sql/old/3.3.5a/2012_05_19_00_world_quest_template.sql
new file mode 100644
index 00000000000..f18172ed836
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_19_00_world_quest_template.sql
@@ -0,0 +1,2 @@
+-- Change Flags for the Body and Heart Quest
+UPDATE `quest_template` SET `Flags`=`Flags`&~2, `SpecialFlags`=`SpecialFlags`|2 WHERE `id` IN (6001,6002);
diff --git a/sql/old/3.3.5a/2012_05_19_01_world_smart_scripts.sql b/sql/old/3.3.5a/2012_05_19_01_world_smart_scripts.sql
new file mode 100644
index 00000000000..06169d8610a
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_19_01_world_smart_scripts.sql
@@ -0,0 +1,7 @@
+-- Fix Quest 9962,9967,9970,9972,9973
+UPDATE `smart_scripts` SET `target_type`=16 WHERE `entryorguid`=18398 AND `id`=1; -- Brokentoe
+UPDATE `smart_scripts` SET `target_type`=16 WHERE `entryorguid`=18399 AND `id`=4; -- Murkblood Twin
+UPDATE `smart_scripts` SET `target_type`=16 WHERE `entryorguid`=18400 AND `id`=5; -- Rokdar the Sundered Lord
+UPDATE `smart_scripts` SET `target_type`=16 WHERE `entryorguid`=18401 AND `id`=3; -- Skra'gath
+UPDATE `smart_scripts` SET `id`=5,`link`=6,`target_type`=16 WHERE `entryorguid`=18402 AND `action_type`=15; -- Warmaul Champion
+UPDATE `smart_scripts` SET `id`=6 WHERE `entryorguid`=18402 AND `action_type`=45; -- Warmaul Champion
diff --git a/sql/old/3.3.5a/2012_05_19_02_world_misc.sql b/sql/old/3.3.5a/2012_05_19_02_world_misc.sql
new file mode 100644
index 00000000000..97a77ac0ab3
--- /dev/null
+++ b/sql/old/3.3.5a/2012_05_19_02_world_misc.sql
@@ -0,0 +1,6 @@
+-- 2012-05-19 12:48:24 SourceEntry 52264 in `condition` table, has incorrect SourceGroup 0 (spell effectMask) set , ignoring.
+UPDATE `conditions` SET `SourceGroup`=1 WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=0 AND `SourceEntry`=52264 AND `SourceId`=0 AND `ElseGroup`=0 AND `ConditionTypeOrReference`=29 AND `ConditionTarget`=0 AND `ConditionValue1`=28653 AND `ConditionValue2`=5 AND `ConditionValue3`=0;
+
+-- 2012-05-19 12:48:18 Quest 384 has `ZoneOrSort` = -304 but `RequiredSkillId` does not have a corresponding value (185).
+-- It is not clear if cooking was required on 3.3.5, so reverting it to its original state (however we are sure it is not required in Cata)
+UPDATE `quest_template` SET `RequiredSkillId`=185, `RequiredSkillPoints`=1 WHERE `Id`=384;
diff --git a/sql/updates/world/2012_05_19_03_world_version.sql b/sql/updates/world/2012_05_19_03_world_version.sql
new file mode 100644
index 00000000000..53c6821be69
--- /dev/null
+++ b/sql/updates/world/2012_05_19_03_world_version.sql
@@ -0,0 +1 @@
+UPDATE `version` SET `db_version`='TDB 335.11.47' LIMIT 1;
diff --git a/sql/updates/world/2012_05_19_04_creature_loot_template.sql b/sql/updates/world/2012_05_19_04_creature_loot_template.sql
new file mode 100644
index 00000000000..ae996e01956
--- /dev/null
+++ b/sql/updates/world/2012_05_19_04_creature_loot_template.sql
@@ -0,0 +1 @@
+DELETE FROM `creature_loot_template` WHERE `entry`=31813 AND `item`=36912; -- Saronite Ore
diff --git a/sql/updates/world/2012_05_19_05_gameobject_loot_template.sql b/sql/updates/world/2012_05_19_05_gameobject_loot_template.sql
new file mode 100644
index 00000000000..f95cb45efe4
--- /dev/null
+++ b/sql/updates/world/2012_05_19_05_gameobject_loot_template.sql
@@ -0,0 +1,93 @@
+-- Set Variables
+SET @Gunship10N := 28057; -- Data1 for 201872 & 202177
+SET @Gunship10H := 28045; -- Data1 for 201873 & 202178
+SET @Gunship25N := 28072; -- Data1 for 201874 & 202179
+SET @Gunship25H := 28090; -- Data1 for 201875 & 202180
+SET @emblem := 49426; -- Emblem of Frost
+SET @SfShard := 50274; -- Shadowfrost Shard
+SET @PriSar := 49908; -- Primordial Saronite
+-- Dug up the old references i created for UP34:
+SET @Ref10J := 34329;
+SET @Ref25J := 34251;
+SET @RefJ10H := 34263;
+SET @RefJ25H := 34275;
+-- Gunship_Armory10N_reference
+DELETE FROM `reference_loot_template` WHERE `entry` IN (@Ref10J,@Ref25J,@RefJ10H,@RefJ25H);
+INSERT INTO `reference_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(@Ref10J,50791,0,1,1,1,1), -- Saronite Gargoyle Cloak
+(@Ref10J,50795,0,1,1,1,1), -- Cord of Dark Suffering
+(@Ref10J,50794,0,1,1,1,1), -- Neverending Winter
+(@Ref10J,50787,0,1,1,1,1), -- Frost Giant's Cleaver
+(@Ref10J,50793,0,1,1,1,1), -- Midnight Sun
+(@Ref10J,50788,0,1,1,1,1), -- Bone Drake's Enameled Boots
+(@Ref10J,50792,0,1,1,1,1), -- Pauldrons of Lost Hope
+(@Ref10J,50340,0,1,1,1,1), -- Muradin's Spyglass
+(@Ref10J,50797,0,1,1,1,1), -- Ice-Reinforced Vrykul Helm
+(@Ref10J,50790,0,1,1,1,1), -- Abomination's Bloody Ring
+(@Ref10J,50789,0,1,1,1,1), -- Icecrown Rampart Bracers
+(@Ref10J,50796,0,1,1,1,1), -- Bracers of Pale Illumination
+-- Gunship_Armory25N_reference
+(@Ref25J,50011,0,1,1,1,1), -- Gunship Captain's Mittens
+(@Ref25J,50002,0,1,1,1,1), -- Polar Bear Claw Bracers
+(@Ref25J,50006,0,1,1,1,1), -- Corp'rethar Ceremonial Crown
+(@Ref25J,50010,0,1,1,1,1), -- Waistband of Righteous Fury
+(@Ref25J,50003,0,1,1,1,1), -- Boneguard Commander's Pauldrons
+(@Ref25J,50000,0,1,1,1,1), -- Scourge Hunter's Vambraces
+(@Ref25J,50359,0,1,1,1,1), -- Althor's Abacus
+(@Ref25J,50352,0,1,1,1,1), -- Corpse Tongue Coin
+(@Ref25J,49999,0,1,1,1,1), -- Skeleton Lord's Circle
+(@Ref25J,50009,0,1,1,1,1), -- Boots of Unnatural Growth
+(@Ref25J,50008,0,1,1,1,1), -- Ring of Rapid Ascent
+(@Ref25J,49998,0,1,1,1,1), -- Shadowvault Slayer's Cloak
+(@Ref25J,50005,0,1,1,1,1), -- Amulet of the Silent Eulogy
+(@Ref25J,50411,0,1,1,1,1), -- Scourgeborne Waraxe
+(@Ref25J,50001,0,1,1,1,1), -- Ikfirus's Sack of Wonder
+-- Gunship_Armory10H_reference
+(@RefJ10H,51912,0,1,1,1,1), -- Saronite Gargoyle Cloak (heroic)
+(@RefJ10H,51908,0,1,1,1,1), -- Cord of Dark Suffering (heroic)
+(@RefJ10H,51909,0,1,1,1,1), -- Neverending Winter (heroic)
+(@RefJ10H,51916,0,1,1,1,1), -- Frost Giant's Cleaver (heroic)
+(@RefJ10H,51910,0,1,1,1,1), -- Midnight Sun (heroic)
+(@RefJ10H,51915,0,1,1,1,1), -- Bone Drake's Enameled Boots (heroic)
+(@RefJ10H,51911,0,1,1,1,1), -- Pauldrons of Lost Hope (heroic)
+(@RefJ10H,50345,0,1,1,1,1), -- Muradin's Spyglass (heroic)
+(@RefJ10H,51906,0,1,1,1,1), -- Ice-Reinforced Vrykul Helm (heroic)
+(@RefJ10H,51913,0,1,1,1,1), -- Abomination's Bloody Ring (heroic)
+(@RefJ10H,51914,0,1,1,1,1), -- Icecrown Rampart Bracers (heroic)
+(@RefJ10H,51907,0,1,1,1,1), -- Bracers of Pale Illumination (heroic)
+-- Gunship_Armory25H_reference
+(@RefJ25H,50663,0,1,1,1,1), -- Gunship Captain's Mittens (heroic)
+(@RefJ25H,50659,0,1,1,1,1), -- Polar Bear Claw Bracers (heroic)
+(@RefJ25H,50661,0,1,1,1,1), -- Corp'rethar Ceremonial Crown (heroic)
+(@RefJ25H,50667,0,1,1,1,1), -- Waistband of Righteous Fury (heroic)
+(@RefJ25H,50660,0,1,1,1,1), -- Boneguard Commander's Pauldrons (heroic)
+(@RefJ25H,50655,0,1,1,1,1), -- Scourge Hunter's Vambraces (heroic)
+(@RefJ25H,50366,0,1,1,1,1), -- Althor's Abacus (heroic)
+(@RefJ25H,50349,0,1,1,1,1), -- Corpse Tongue Coin (heroic)
+(@RefJ25H,50657,0,1,1,1,1), -- Skeleton Lord's Circle (heroic)
+(@RefJ25H,50665,0,1,1,1,1), -- Boots of Unnatural Growth (heroic)
+(@RefJ25H,50664,0,1,1,1,1), -- Ring of Rapid Ascent (heroic)
+(@RefJ25H,50653,0,1,1,1,1), -- Shadowvault Slayer's Cloak (heroic)
+(@RefJ25H,50658,0,1,1,1,1), -- Amulet of the Silent Eulogy (heroic)
+(@RefJ25H,50654,0,1,1,1,1), -- Scourgeborne Waraxe (heroic)
+(@RefJ25H,50656,0,1,1,1,1); -- Ikfirus's Sack of Wonder (heroic)
+-- Bind the refs to the objects
+DELETE FROM `gameobject_loot_template` WHERE `entry` IN (@Gunship10N,@Gunship10H,@Gunship25N,@Gunship25H);
+INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+-- Gunship10N
+(@Gunship10N,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 10N
+(@Gunship10N,1,100,1,0,-@Ref10J,2), -- 2 from reference 10Normal
+-- Gunship25N
+(@Gunship25N,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 25N
+(@Gunship25N,1,100,1,0,-@Ref25J,2), -- 3 from reference 25Normal
+(@Gunship25N,@SfShard,-35,1,0,1,1), -- Shadowfrost Shard @ 38% chance
+(@Gunship25N,@PriSar,38,1,0,1,1), -- Primordial Saronite @ 10% chance
+-- Gunship10H
+(@Gunship10H,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 10H
+(@Gunship10H,1,100,1,0,-@RefJ10H,2), -- 2 from reference 10Heroic
+(@Gunship10H,@PriSar,38,1,0,1,1), -- Primordial Saronite @ 38% chance
+-- Gunship25H
+(@Gunship25H,@emblem,100,1,0,2,2), -- Gunship Armory 2xemblems 25H
+(@Gunship25H,1,100,1,0,-@RefJ25H,2), -- 3 from reference 25Heroic
+(@Gunship25H,@SfShard,-75,1,0,1,1), -- Shadowfrost Shard @ 75% chance
+(@Gunship25H,@PriSar,50,1,0,1,1); -- Primordial Saronite @ 50% chance
diff --git a/sql/updates/world/2012_05_19_06_gameobject_loot_template.sql b/sql/updates/world/2012_05_19_06_gameobject_loot_template.sql
new file mode 100644
index 00000000000..9b2dcbb9363
--- /dev/null
+++ b/sql/updates/world/2012_05_19_06_gameobject_loot_template.sql
@@ -0,0 +1,13 @@
+DELETE FROM `reference_loot_template` WHERE `entry`=34172;
+DELETE FROM `creature_loot_template` WHERE `entry`=38013;
+DELETE FROM `gameobject_loot_template` WHERE `entry`=28683;
+INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(28683,35498,3,1,0,1,1), -- Formula: Enchant Weapon - Deathfrost
+(28683,35557,28,1,0,1,2), -- Huge Snowball
+(28683,35720,3,1,0,5,6), -- Lord of Frost's Private Label
+(28683,35723,12,1,0,1,1), -- Shards of Ahune
+(28683,54801,0,1,1,1,1), -- Icebound Cloak
+(28683,54802,0,1,1,1,1), -- The Frost Lord's War Cloak
+(28683,54803,0,1,1,1,1), -- The Frost Lord's Battle Shroud
+(28683,54804,0,1,1,1,1), -- Shroud of Winter's Chill
+(28683,54805,0,1,1,1,1); -- Cloak of the Frigid Winds
diff --git a/sql/updates/world/2012_05_20_00_world_misc.sql b/sql/updates/world/2012_05_20_00_world_misc.sql
new file mode 100644
index 00000000000..5b96f9881d6
--- /dev/null
+++ b/sql/updates/world/2012_05_20_00_world_misc.sql
@@ -0,0 +1,16 @@
+-- Update mod rep command name
+UPDATE `command` SET 
+    `name` = 'modify reputation',
+    `help` = 'Syntax: .modify reputation #repId (#repvalue | $rankname [#delta])\nSets the selected players reputation with faction #repId to #repvalue or to $reprank.\nIf the reputation rank name is provided, the resulting reputation will be the lowest reputation for that rank plus the delta amount, if specified.\nYou can use \'.pinfo rep\' to list all known reputation ids, or use \'.lookup faction $name\' to locate a specific faction id.'
+WHERE `name` = 'modify rep';
+
+-- Fix "2012-05-20 06:46:00 ERROR: SourceEntry 52264 in `condition` table, has incorrect SourceGroup 0 (spell effectMask) set , ignoring."
+UPDATE `conditions` SET
+    `SourceGroup` = 1,
+    `SourceId` = 0
+WHERE 
+    `SourceTypeOrReferenceId` = 13 AND
+    `SourceEntry` = 52264 AND
+    `ConditionTypeOrReference` = 29 AND
+    `ConditionValue1` = 28653 AND
+    `ConditionValue2` = 5;
diff --git a/sql/updates/world/2012_05_20_01_world_spell_bonus_data.sql b/sql/updates/world/2012_05_20_01_world_spell_bonus_data.sql
new file mode 100644
index 00000000000..7603f7dd938
--- /dev/null
+++ b/sql/updates/world/2012_05_20_01_world_spell_bonus_data.sql
@@ -0,0 +1,2 @@
+DELETE FROM `spell_bonus_data` WHERE `entry`=633; 
+INSERT INTO `spell_bonus_data` (`entry`,`comments`) VALUES (633,'Paladin - Lay on Hands'); 
diff --git a/sql/updates/world/2012_05_22_00_world_spell_proc_event.sql b/sql/updates/world/2012_05_22_00_world_spell_proc_event.sql
new file mode 100644
index 00000000000..ba2ea83f643
--- /dev/null
+++ b/sql/updates/world/2012_05_22_00_world_spell_proc_event.sql
@@ -0,0 +1 @@
+UPDATE `spell_proc_event` SET `procFlags` = 332116 WHERE `entry` = 63611;
diff --git a/sql/updates/world/2012_05_22_01_world_creature_loot_template.sql b/sql/updates/world/2012_05_22_01_world_creature_loot_template.sql
new file mode 100644
index 00000000000..bcae5be9ae1
--- /dev/null
+++ b/sql/updates/world/2012_05_22_01_world_creature_loot_template.sql
@@ -0,0 +1,2 @@
+-- As of patch 3.1.0, the drop rate of Formula: Enchant Boots - Surefooted has been increased to Guaranteed (100%).
+UPDATE `creature_loot_template` SET `ChanceOrQuestChance`=100 WHERE `entry`=16472 and `item`=22545;
diff --git a/sql/updates/world/2012_05_23_00_world_creature.sql b/sql/updates/world/2012_05_23_00_world_creature.sql
new file mode 100644
index 00000000000..8a965b7fdfe
--- /dev/null
+++ b/sql/updates/world/2012_05_23_00_world_creature.sql
@@ -0,0 +1,55 @@
+-- Chicken Spawns from sniff:
+SET @Chicken := 28161;
+SET @CGUID := 88570;
+DELETE FROM `creature` WHERE `id`=@Chicken;
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`MovementType`) VALUES
+(@CGUID,@Chicken,571,1,1,5199.809,4704.83,-128.2989,1.70125,120,0,0), -- Chicken Escapee
+(@CGUID+1,@Chicken,571,1,1,5201.715,4702.484,-127.8371,1.53589,120,0,0), -- Chicken Escapee
+(@CGUID+2,@Chicken,571,1,1,5198.132,4702.78,-127.5534,1.797689,120,0,0), -- Chicken Escapee
+(@CGUID+3,@Chicken,571,1,1,5198.32,4704.375,-127.9992,1.064651,120,0,0), -- Chicken Escapee
+(@CGUID+4,@Chicken,571,1,1,5201.744,4704.674,-128.4752,4.555309,120,0,0), -- Chicken Escapee
+(@CGUID+5,@Chicken,571,1,1,5251.442,4508.976,-85.30431,4.304774,120,0,0), -- Chicken Escapee
+(@CGUID+6,@Chicken,571,1,1,5251.708,4511.778,-85.32935,1.64061,120,0,0), -- Chicken Escapee
+(@CGUID+7,@Chicken,571,1,1,5251.118,4509.744,-85.32935,4.886922,120,0,0), -- Chicken Escapee
+(@CGUID+8,@Chicken,571,1,1,5252.795,4509.772,-85.32524,0.7853982,120,0,0), -- Chicken Escapee
+(@CGUID+9,@Chicken,571,1,1,5253.682,4511.424,-85.32755,2.356194,120,0,0), -- Chicken Escapee
+(@CGUID+10,@Chicken,571,1,1,5254.174,4514.632,-84.96572,0.4096795,120,0,0), -- Chicken Escapee
+(@CGUID+11,@Chicken,571,1,1,5252.096,4514.868,-85.32635,4.363323,120,0,0), -- Chicken Escapee
+(@CGUID+12,@Chicken,571,1,1,5251.637,4513.41,-85.32935,3.490659,120,0,0), -- Chicken Escapee
+(@CGUID+13,@Chicken,571,1,1,5253.287,4513.109,-85.32935,3.036873,120,0,0), -- Chicken Escapee
+(@CGUID+14,@Chicken,571,1,1,5253.494,4514.764,-85.31329,3.717551,120,0,0), -- Chicken Escapee
+(@CGUID+15,@Chicken,571,1,1,5251.158,4518.321,-85.3019,1.592369,120,0,0), -- Chicken Escapee
+(@CGUID+16,@Chicken,571,1,1,5250.385,4516.643,-85.3257,5.044002,120,0,0), -- Chicken Escapee
+(@CGUID+17,@Chicken,571,1,1,5251.159,4515.294,-85.32935,4.694936,120,0,0), -- Chicken Escapee
+(@CGUID+18,@Chicken,571,1,1,5252.267,4516.414,-85.30904,0.5235988,120,0,0), -- Chicken Escapee
+(@CGUID+19,@Chicken,571,1,1,5251.693,4517.859,-85.3243,4.590216,120,0,0), -- Chicken Escapee
+(@CGUID+20,@Chicken,571,1,1,5262.68,4528.738,-84.4747,4.718389,120,0,0), -- Chicken Escapee
+(@CGUID+21,@Chicken,571,1,1,5256.907,4480.617,-84.26879,4.927223,120,0,0), -- Chicken Escapee
+(@CGUID+22,@Chicken,571,1,1,5298.603,4489.708,-93.65161,6.16371,120,0,0), -- Chicken Escapee
+(@CGUID+23,@Chicken,571,1,1,5192.673,4513.661,-89.12463,1.299241,120,0,0), -- Chicken Escapee
+(@CGUID+24,@Chicken,571,1,1,5228.781,4579.799,-96.98647,0.05766594,120,0,0), -- Chicken Escapee
+(@CGUID+25,@Chicken,571,1,1,5230.247,4433.143,-96.82567,5.135688,120,0,0), -- Chicken Escapee
+(@CGUID+26,@Chicken,571,1,1,5180.035,4541.38,-97.84879,0.2208638,120,0,0), -- Chicken Escapee
+(@CGUID+27,@Chicken,571,1,1,5178.563,4538.964,-97.54511,0.9771074,120,0,0), -- Chicken Escapee
+(@CGUID+28,@Chicken,571,1,1,5272.981,4417.033,-96.50356,0.9044432,120,0,0), -- Chicken Escapee
+(@CGUID+29,@Chicken,571,1,1,5214.513,4416.202,-96.53072,2.862281,120,0,0), -- Chicken Escapee
+(@CGUID+30,@Chicken,571,1,1,5160.117,4474.996,-96.96887,4.499754,120,0,0), -- Chicken Escapee
+(@CGUID+31,@Chicken,571,1,1,5263.541,4409.121,-95.87889,1.570796,120,0,0), -- Chicken Escapee
+(@CGUID+32,@Chicken,571,1,1,5234.166,4404.604,-95.12725,1.031549,120,0,0), -- Chicken Escapee
+(@CGUID+33,@Chicken,571,1,1,5297.803,4493.681,-93.65161,5.525303,120,0,0), -- Chicken Escapee
+(@CGUID+34,@Chicken,571,1,1,5260.112,4340.577,-97.61092,1.942801,120,0,0), -- Chicken Escapee
+(@CGUID+35,@Chicken,571,1,1,5208.492,4379.111,-95.49483,0.6675518,120,0,0), -- Chicken Escapee
+(@CGUID+36,@Chicken,571,1,1,5172.742,4368.674,-96.27965,0.8766832,120,0,0), -- Chicken Escapee
+(@CGUID+37,@Chicken,571,1,1,5223.491,4467.19,-96.75621,4.723376,120,0,0), -- Chicken Escapee
+(@CGUID+38,@Chicken,571,1,1,5220.966,4469.76,-96.75582,5.183968,120,0,0), -- Chicken Escapee
+(@CGUID+39,@Chicken,571,1,1,5221.419,4473.14,-96.75536,4.98181,120,0,0), -- Chicken Escapee
+(@CGUID+40,@Chicken,571,1,1,5221.419,4473.14,-96.75536,5.49084,120,0,0), -- Chicken Escapee
+(@CGUID+41,@Chicken,571,1,1,5221.828,4470.711,-96.57594,5.315169,120,0,0), -- Chicken Escapee
+(@CGUID+42,@Chicken,571,1,1,5151.083,4416.434,-96.38642,2.066685,120,0,0), -- Chicken Escapee
+(@CGUID+43,@Chicken,571,1,1,5281.582,4425.185,-96.79945,4.45059,120,0,0), -- Chicken Escapee
+(@CGUID+44,@Chicken,571,1,1,5257.173,4424.231,-95.62836,3.996804,120,0,0); -- Chicken Escapee
+
+-- Aura for Chicken Escapee (thx Discovered)
+DELETE FROM `creature_template_addon` WHERE `entry`=28161;
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(28161,0,0,0,0,'50734'); -- Chicken Escapee - Frenzyheart Chicken: Invisibility
diff --git a/sql/updates/world/2012_05_23_01_world_sai.sql b/sql/updates/world/2012_05_23_01_world_sai.sql
new file mode 100644
index 00000000000..af2fd5409d1
--- /dev/null
+++ b/sql/updates/world/2012_05_23_01_world_sai.sql
@@ -0,0 +1,14 @@
+-- Delete all spawnings of Chicken Escapee via quest_start_scripts
+DELETE FROM `quest_start_scripts` WHERE `command`=10 AND `datalong`=28161;
+
+-- Elder Harkek SAI
+SET @ENTRY := 28138;
+SET @SPELL_SEE_INVIS_CHICKEN := 50735;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,19,0,100,0,12532,0,0,0,85,@SPELL_SEE_INVIS_CHICKEN,2,0,0,0,0,7,0,0,0,0,0,0,0,"Elder Harkek - On Quest Accept - Invoker Cast Frenzyheart Chicken: See Invisibility"),
+(@ENTRY,0,1,0,19,0,100,0,12702,0,0,0,85,@SPELL_SEE_INVIS_CHICKEN,2,0,0,0,0,7,0,0,0,0,0,0,0,"Elder Harkek - On Quest Accept - Invoker Cast Frenzyheart Chicken: See Invisibility"),
+(@ENTRY,0,2,0,20,0,100,0,12532,0,0,0,28,@SPELL_SEE_INVIS_CHICKEN,0,0,0,0,0,7,0,0,0,0,0,0,0,"Elder Harkek - On Quest Complete - Remove Aura Frenzyheart Chicken: See Invisibility"),
+(@ENTRY,0,3,0,20,0,100,0,12702,0,0,0,28,@SPELL_SEE_INVIS_CHICKEN,0,0,0,0,0,7,0,0,0,0,0,0,0,"Elder Harkek - On Quest Complete - Remove Aura Frenzyheart Chicken: See Invisibility");
diff --git a/sql/updates/world/2012_05_23_02_world_sai.sql b/sql/updates/world/2012_05_23_02_world_sai.sql
new file mode 100644
index 00000000000..588f25f1568
--- /dev/null
+++ b/sql/updates/world/2012_05_23_02_world_sai.sql
@@ -0,0 +1,21 @@
+-- Chicken Escapee SAI
+SET @ENTRY := 28161;
+SET @SPELL_NET_CHICKEN := 51959;
+SET @SPELL_INVIS_CHICKEN := 50734;
+SET @SPELL_SCARED_CHICKEN := 51846;
+SET @SPELL_CREATE_QUESTITEM := 51037;
+UPDATE `creature` SET `MovementType`=0,`spawndist`=0,`spawntimesecs`=5 WHERE `id`=@ENTRY;
+UPDATE `creature_template` SET `AIName`='SmartAI',`npcflag`=1 WHERE `entry`=@ENTRY;
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,8,0,100,0,@SPELL_NET_CHICKEN,0,0,0,28,@SPELL_SCARED_CHICKEN,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chicken Escapee - On Spellhit - Remove Aura Scared Chicken"),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,41,4000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chicken Escapee - On Spellhit - Forced Despawn"),
+(@ENTRY,0,2,3,64,0,100,0,0,0,0,0,85,@SPELL_CREATE_QUESTITEM,2,0,0,0,0,7,0,0,0,0,0,0,0,"Chicken Escapee - On Gossip Hello - Invoker Cast Capture Chicken Escapee"), -- Triggered because of cast-time
+(@ENTRY,0,3,4,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Chicken Escapee - On Gossip Hello - Close Gossip"),
+(@ENTRY,0,4,5,61,0,100,0,0,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chicken Escapee - On Gossip Hello - Set Npcflag None"),
+(@ENTRY,0,5,6,61,0,100,0,0,0,0,0,28,@SPELL_SCARED_CHICKEN,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chicken Escapee - On Gossip Hello - Remove Aura Scared Chicken"),
+(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,41,500,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chicken Escapee - On Gossip Hello - Forced Despawn"),
+(@ENTRY,0,7,8,25,0,100,0,0,0,0,0,11,@SPELL_INVIS_CHICKEN,1,0,0,0,0,1,0,0,0,0,0,0,0,"Chicken Escapee - On Reset - Cast Frenzyheart Chicken: Invisibility"), -- Just in case
+(@ENTRY,0,8,0,61,0,100,0,0,0,0,0,11,@SPELL_SCARED_CHICKEN,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chicken Escapee - On Reset - Cast Scared Chicken");
diff --git a/sql/updates/world/2012_05_23_03_world_gameobject_loot_template.sql b/sql/updates/world/2012_05_23_03_world_gameobject_loot_template.sql
new file mode 100644
index 00000000000..22ecebcae31
--- /dev/null
+++ b/sql/updates/world/2012_05_23_03_world_gameobject_loot_template.sql
@@ -0,0 +1,32 @@
+SET @entry := 35093;
+SET @epic := 25009;
+SET @gem := @entry+1;
+-- Create references
+DELETE FROM `reference_loot_template` WHERE `entry` IN(@entry,@epic,@gem);
+INSERT INTO `reference_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) VALUES 
+(@entry,27452,0,1,1,1,1), -- Light Scribe Bands
+(@entry,27453,0,1,1,1,1), -- Averinn's RIng of Slaying
+(@entry,27454,0,1,1,1,1), -- Volcanic Pauldrons
+(@entry,27455,0,1,1,1,1), -- Irondrake faceguard
+(@entry,27456,0,1,1,1,1), -- Raiments of Nature's Breath
+(@entry,27457,0,1,1,1,1), -- Life Bearer's Gauntlets
+(@entry,27458,0,1,1,1,1), -- Oceansong Kilt
+(@entry,27459,0,1,1,1,1), -- Vambraces of Daring
+(@entry,27460,0,1,1,1,1), -- Reavers' Ring
+(@entry,27461,0,1,1,1,1), -- Chestguard of the Prowler
+-- Epics
+(@epic,29238,0,1,1,1,1), -- Lion's Heart Girdle
+(@epic,29264,0,1,1,1,1), -- Tree-Mender's Belt
+(@epic,29346,0,1,1,1,1), -- Feltooth Eviscerator
+(@epic,32077,0,1,1,1,1), -- Wrath Infused Gauntlets
+-- Gems
+(@gem,30592,0,1,1,1,1), -- Steady Chrysoprase
+(@gem,30593,0,1,1,1,1), -- Potent Fire Opal
+(@gem,30594,0,1,1,1,1); -- Regal Chrysoprase
+-- Assign loot to the chest
+SET @GOloot := 21764; -- lootid of Reinforced Fel Iron Chest Heroic
+DELETE FROM `gameobject_loot_template` WHERE `entry`=@GOloot;
+INSERT INTO `gameobject_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) VALUES 
+(@GOloot,1,100,1,0,-@entry, 2), -- one from gear
+(@GOloot,2,30,1,0,-@gem,1), -- one gem (30%)
+(@GOloot,3,100,1,0,-@epic,1); -- one from epics
diff --git a/sql/updates/world/2012_05_23_04_world_gameobject.sql b/sql/updates/world/2012_05_23_04_world_gameobject.sql
new file mode 100644
index 00000000000..afcb1e89317
--- /dev/null
+++ b/sql/updates/world/2012_05_23_04_world_gameobject.sql
@@ -0,0 +1,3 @@
+DELETE FROM `gameobject` WHERE `id`=188677;
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
+(318,188677,571,1,1,2567.449,-388.7118,3.573463,-2.879789,0,0,0.639778,0.76856,1200,100,1);
diff --git a/sql/updates/world/2012_05_23_05_world_creature.sql b/sql/updates/world/2012_05_23_05_world_creature.sql
new file mode 100644
index 00000000000..bb162f927bd
--- /dev/null
+++ b/sql/updates/world/2012_05_23_05_world_creature.sql
@@ -0,0 +1,12 @@
+-- Spawn from Sniff
+DELETE FROM `creature` WHERE `id`=34526;
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES 
+(42161,34526,1,1,1,0,0,-1050.052,-286.7274,159.1137,5.951573,120,0,0,1,0,0,0,0,0);
+-- Template updates
+UPDATE `creature_template` SET `faction_A`=104,`faction_H`=104,`baseattacktime`=2000,`npcflag`=`npcflag`|3,`unit_flags`=`unit_flags`|512 WHERE `entry`=34526; -- Aponi Brightmane
+-- Model data
+UPDATE `creature_model_info` SET `bounding_radius`=1.003375,`combat_reach`=4.3125,`gender`=1 WHERE `modelid`=29249; -- Aponi Brightmane
+-- Addon data
+DELETE FROM `creature_template_addon` WHERE `entry`=34526;
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(34526,0,1,256,0,NULL); -- Aponi Brightmane
diff --git a/sql/updates/world/2012_05_24_00_world_creature_misc.sql b/sql/updates/world/2012_05_24_00_world_creature_misc.sql
new file mode 100644
index 00000000000..ae35b3fba5d
--- /dev/null
+++ b/sql/updates/world/2012_05_24_00_world_creature_misc.sql
@@ -0,0 +1,5 @@
+UPDATE `creature_template` SET `faction_A`=1914,`faction_H`=1914,`unit_flags`=33024 WHERE `entry`=26452;
+
+DELETE FROM `creature_template_addon` WHERE `entry`=26452;
+INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(26452,0,0,0,1,383,'');
diff --git a/sql/updates/world/2012_05_24_01_world_gameobject.sql b/sql/updates/world/2012_05_24_01_world_gameobject.sql
new file mode 100644
index 00000000000..32bbc15494f
--- /dev/null
+++ b/sql/updates/world/2012_05_24_01_world_gameobject.sql
@@ -0,0 +1,3 @@
+DELETE FROM `gameobject` WHERE `id`=175759 AND `guid`=219;
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
+(219,175759,530,1,1,9636.439,-7231.265,16.73347,-2.82743,0,0,-0.9876881,0.1564362,900,100,1);
diff --git a/sql/updates/world/2012_05_25_00_world_sai.sql b/sql/updates/world/2012_05_25_00_world_sai.sql
new file mode 100644
index 00000000000..fa5682db02f
--- /dev/null
+++ b/sql/updates/world/2012_05_25_00_world_sai.sql
@@ -0,0 +1,6 @@
+-- Eye of the Lich King SAI
+SET @ENTRY := 36913; -- NPC entry
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,1,0,100,6,0,0,1000,1000,66,0,0,0,0,0,0,21,150,0,0,0,0,0,0, 'Eye of the Lich King - OOC - face closest player');
diff --git a/sql/updates/world/2012_05_25_01_world_waypoints.sql b/sql/updates/world/2012_05_25_01_world_waypoints.sql
new file mode 100644
index 00000000000..0d2c04bc6bc
--- /dev/null
+++ b/sql/updates/world/2012_05_25_01_world_waypoints.sql
@@ -0,0 +1,149 @@
+-- Bladewing Bloodletter InhabitType fix
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=21033;
+
+-- Bladewing Bloodletter
+SET @NPC := 73849;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `position_x`=1987.838,`position_y`=6153.995,`position_z`=146.4068,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE
+(@PATH,1,1987.838,6153.995,146.4068,0,0,0,100,0),
+(@PATH,2,1981.592,6150.557,146.4068,0,0,0,100,0),
+(@PATH,3,1966.573,6153.941,146.4068,0,0,0,100,0),
+(@PATH,4,1953.747,6155.154,146.4068,0,0,0,100,0),
+(@PATH,5,1941.287,6159.015,146.4068,0,0,0,100,0),
+(@PATH,6,1937.986,6166.096,146.4068,0,0,0,100,0),
+(@PATH,7,1948.558,6175.274,145.1566,0,0,0,100,0),
+(@PATH,8,1959.44,6173.246,145.6567,0,0,0,100,0),
+(@PATH,9,1971.408,6169.729,145.7679,0,0,0,100,0),
+(@PATH,10,1986.747,6168.348,144.8511,0,0,0,100,0),
+(@PATH,11,1998.881,6168.547,144.4066,0,0,0,100,0),
+(@PATH,12,2008.877,6170.33,143.7955,0,0,0,100,0),
+(@PATH,13,2021.965,6166.769,143.657,0,0,0,100,0),
+(@PATH,14,2027.152,6158.083,145.4344,0,0,0,100,0),
+(@PATH,15,2025.352,6149.427,146.4068,0,0,0,100,0),
+(@PATH,16,2011.869,6150.37,146.4068,0,0,0,100,0),
+(@PATH,17,1999.44,6155.886,146.4068,0,0,0,100,0);
+
+-- Bladewing Bloodletter
+SET @NPC := 73850;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `position_x`=2099.588,`position_y`=6126.344,`position_z`=148.8029,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE
+(@PATH,1,2099.588,6126.344,148.8029,0,0,0,100,0),
+(@PATH,2,2094.131,6133.031,148.303,0,0,0,100,0),
+(@PATH,3,2085.703,6143.32,148.303,0,0,0,100,0),
+(@PATH,4,2077.25,6154.094,148.5252,0,0,0,100,0),
+(@PATH,5,2062.893,6175.25,146.414,0,0,0,100,0),
+(@PATH,6,2056.135,6184.647,144.8307,0,0,0,100,0),
+(@PATH,7,2050.784,6189.019,141.9417,0,0,0,100,0),
+(@PATH,8,2044,6181.015,142.6362,0,0,0,100,0),
+(@PATH,9,2044.303,6175.524,143.3028,0,0,0,100,0),
+(@PATH,10,2053.432,6161.702,145.8306,0,0,0,100,0),
+(@PATH,11,2064.378,6145.299,146.7471,0,0,0,100,0),
+(@PATH,12,2064.748,6135.614,147.7195,0,0,0,100,0),
+(@PATH,13,2067.337,6117.838,149.0529,0,0,0,100,0),
+(@PATH,14,2073.338,6100.975,149.664,0,0,0,100,0),
+(@PATH,15,2089.383,6099.217,149.3585,0,0,0,100,0),
+(@PATH,16,2099.147,6111.964,149.1641,0,0,0,100,0);
+
+-- Bladewing Bloodletter
+SET @NPC := 73852;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `position_x`=2180.795,`position_y`=6149.398,`position_z`=145.9554,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE
+(@PATH,1,2180.795,6149.398,145.9554,0,0,0,100,0),
+(@PATH,2,2185.298,6157.3,146.8721,0,0,0,100,0),
+(@PATH,3,2191.635,6164.935,146.6221,0,0,0,100,0),
+(@PATH,4,2203.45,6168.873,146.2055,0,0,0,100,0),
+(@PATH,5,2217.238,6165.062,145.6221,0,0,0,100,0),
+(@PATH,6,2225.425,6159.092,145.1501,0,0,0,100,0),
+(@PATH,7,2228.766,6146.569,145.3166,0,0,0,100,0),
+(@PATH,8,2225.81,6129.76,143.9,0,0,0,100,0),
+(@PATH,9,2203.906,6114.964,145.0111,0,0,0,100,0),
+(@PATH,10,2184.713,6115.808,145.7333,0,0,0,100,0),
+(@PATH,11,2173.165,6123,146.8721,0,0,0,100,0),
+(@PATH,12,2175.542,6139.301,146.8721,0,0,0,100,0);
+
+-- Bladewing Bloodletter
+SET @NPC := 73853;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `position_x`=2153.506,`position_y`=6119.981,`position_z`=148.0267,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE
+(@PATH,1,2153.506,6119.981,148.0267,0,0,0,100,0),
+(@PATH,2,2144.238,6124.169,148.0267,0,0,0,100,0),
+(@PATH,3,2133.341,6127.807,148.0267,0,0,0,100,0),
+(@PATH,4,2120.865,6126.57,148.0267,0,0,0,100,0),
+(@PATH,5,2110.276,6122.198,148.0267,0,0,0,100,0),
+(@PATH,6,2108.702,6111.856,148.0267,0,0,0,100,0),
+(@PATH,7,2113.887,6104.159,148.0267,0,0,0,100,0),
+(@PATH,8,2123.298,6095.088,148.0267,0,0,0,100,0),
+(@PATH,9,2136.37,6099.125,148.0267,0,0,0,100,0),
+(@PATH,10,2146.343,6107.208,148.0267,0,0,0,100,0),
+(@PATH,11,2150.752,6118.491,148.0267,0,0,0,100,0),
+(@PATH,12,2158.115,6126.979,148.0267,0,0,0,100,0),
+(@PATH,13,2168.949,6133.578,148.0267,0,0,0,100,0),
+(@PATH,14,2180.009,6134.229,148.0267,0,0,0,100,0),
+(@PATH,15,2189.201,6129.583,148.0267,0,0,0,100,0),
+(@PATH,16,2192.429,6119.862,148.0267,0,0,0,100,0),
+(@PATH,17,2187.044,6112.755,148.0267,0,0,0,100,0),
+(@PATH,18,2176.445,6111.443,148.0267,0,0,0,100,0),
+(@PATH,19,2166.243,6114.129,148.0267,0,0,0,100,0);
+
+-- Bladewing Bloodletter
+SET @NPC := 73858;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `position_x`=2128.704,`position_y`=6018.743,`position_z`=141.9579,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE
+(@PATH,1,2128.704,6018.743,141.9579,0,0,0,100,0),
+(@PATH,2,2118.804,6016.506,141.9433,0,0,0,100,0),
+(@PATH,3,2100.692,6019.814,141.9433,0,0,0,100,0),
+(@PATH,4,2080.599,6017.728,144.3877,0,0,0,100,0),
+(@PATH,5,2070.564,6003.17,144.1802,0,0,0,100,0),
+(@PATH,6,2079.148,5988.599,143.5968,0,0,0,100,0),
+(@PATH,7,2088.214,5974.081,142.9579,0,0,0,100,0),
+(@PATH,8,2102.427,5966.812,142.208,0,0,0,100,0),
+(@PATH,9,2117.762,5969.647,141.9579,0,0,0,100,0),
+(@PATH,10,2130.632,5977.25,141.9579,0,0,0,100,0),
+(@PATH,11,2135.56,5993.264,141.9579,0,0,0,100,0),
+(@PATH,12,2148.631,6003.11,141.1247,0,0,0,100,0),
+(@PATH,13,2144.206,6017.48,141.9579,0,0,0,100,0);
+
+-- Bladewing Bloodletter
+SET @NPC := 73860;
+SET @PATH := @NPC*10;
+UPDATE `creature` SET `position_x`=1951.455,`position_y`=5919.516,`position_z`=140.4673,`spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (@NPC,@PATH,1);
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUE
+(@PATH,1,1951.455,5919.516,140.4673,0,0,0,100,0),
+(@PATH,2,1953.539,5912.287,140.4179,0,0,0,100,0),
+(@PATH,3,1955.967,5902.248,140.4179,0,0,0,100,0),
+(@PATH,4,1947.568,5889.415,140.4179,0,0,0,100,0),
+(@PATH,5,1938.332,5877.63,140.4179,0,0,0,100,0),
+(@PATH,6,1946.422,5859.488,140.4179,0,0,0,100,0),
+(@PATH,7,1958.004,5850.275,140.4179,0,0,0,100,0),
+(@PATH,8,1967.889,5861.601,140.4673,0,0,0,100,0),
+(@PATH,9,1967.766,5874.843,140.4673,0,0,0,100,0),
+(@PATH,10,1962.739,5881.181,140.4673,0,0,0,100,0),
+(@PATH,11,1965.367,5889.64,140.4673,0,0,0,100,0),
+(@PATH,12,1977.617,5904.389,140.4673,0,0,0,100,0),
+(@PATH,13,1979.003,5918.971,140.4673,0,0,0,100,0),
+(@PATH,14,1969.612,5933.128,140.4673,0,0,0,100,0),
+(@PATH,15,1958.879,5940.208,140.4673,0,0,0,100,0),
+(@PATH,16,1952.594,5927.489,140.4673,0,0,0,100,0);
diff --git a/sql/updates/world/2012_05_25_02_world_creature_template.sql b/sql/updates/world/2012_05_25_02_world_creature_template.sql
new file mode 100644
index 00000000000..fd4c1743f07
--- /dev/null
+++ b/sql/updates/world/2012_05_25_02_world_creature_template.sql
@@ -0,0 +1,2 @@
+-- Floating Flavor Eye InhabitType fix
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=21659;
diff --git a/sql/updates/world/2012_05_25_03_world_template.sql b/sql/updates/world/2012_05_25_03_world_template.sql
new file mode 100644
index 00000000000..6ef112f342f
--- /dev/null
+++ b/sql/updates/world/2012_05_25_03_world_template.sql
@@ -0,0 +1,8 @@
+-- Fix unit flags for Blackhand Incarcerator
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|768 WHERE `entry`=10316;
+-- Fix unit flags for Pyroguard Emberseer
+UPDATE `creature_template` SET `unit_flags`=`unit_flags`|33554688 WHERE `entry`=9816;
+-- Remove hack event script
+DELETE FROM `event_scripts` WHERE `id`=4884;
+-- Remove script to Dragonspire Hall Runes "UBRS"
+UPDATE `gameobject_template` SET `ScriptName`= '' WHERE `entry` BETWEEN 175194 AND 175200;
diff --git a/sql/updates/world/2012_05_26_00_world_scripts.sql b/sql/updates/world/2012_05_26_00_world_scripts.sql
new file mode 100644
index 00000000000..18b0fa2f6b2
--- /dev/null
+++ b/sql/updates/world/2012_05_26_00_world_scripts.sql
@@ -0,0 +1,20 @@
+-- Correction for Obsidian Nullifier EAI
+UPDATE `creature_ai_scripts` SET
+    `action1_param1` = 23
+WHERE `id` = 1531201;
+
+-- Correction for Wildspawn Felsworn and Wildspawn Hellcaller SAI
+UPDATE `smart_scripts` SET
+    `event_phase_mask` = 2,
+    `action_type` = 22,
+    `action_param1` = 1,
+    `target_type` = 1
+WHERE 
+    (`entryorguid` = 11457 AND
+    `source_type` = 0 AND
+    `id` = 10 AND
+    `link` = 0) OR
+    (`entryorguid` = 11455 AND
+    `source_type` = 0 AND
+    `id` = 11 AND
+    `link` = 0);
diff --git a/sql/updates/world/2012_05_26_01_world_spell_dbc.sql b/sql/updates/world/2012_05_26_01_world_spell_dbc.sql
new file mode 100644
index 00000000000..7efebc37489
--- /dev/null
+++ b/sql/updates/world/2012_05_26_01_world_spell_dbc.sql
@@ -0,0 +1,4 @@
+-- Fire Shield from 2.0.12 dbc
+DELETE FROM `spell_dbc` WHERE `Id`=13377;
+INSERT INTO `spell_dbc` (`Id`, `Dispel`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `Stances`, `StancesNot`, `Targets`, `CastingTimeIndex`, `AuraInterruptFlags`, `ProcFlags`, `ProcChance`, `ProcCharges`, `MaxLevel`, `BaseLevel`, `SpellLevel`, `DurationIndex`, `RangeIndex`, `StackAmount`, `EquippedItemClass`, `EquippedItemSubClassMask`, `EquippedItemInventoryTypeMask`, `Effect1`, `Effect2`, `Effect3`, `EffectDieSides1`, `EffectDieSides2`, `EffectDieSides3`, `EffectRealPointsPerLevel1`, `EffectRealPointsPerLevel2`, `EffectRealPointsPerLevel3`, `EffectBasePoints1`, `EffectBasePoints2`, `EffectBasePoints3`, `EffectMechanic1`, `EffectMechanic2`, `EffectMechanic3`, `EffectImplicitTargetA1`, `EffectImplicitTargetA2`, `EffectImplicitTargetA3`, `EffectImplicitTargetB1`, `EffectImplicitTargetB2`, `EffectImplicitTargetB3`, `EffectRadiusIndex1`, `EffectRadiusIndex2`, `EffectRadiusIndex3`, `EffectApplyAuraName1`, `EffectApplyAuraName2`, `EffectApplyAuraName3`, `EffectAmplitude1`, `EffectAmplitude2`, `EffectAmplitude3`, `EffectMultipleValue1`, `EffectMultipleValue2`, `EffectMultipleValue3`, `EffectMiscValue1`, `EffectMiscValue2`, `EffectMiscValue3`, `EffectMiscValueB1`, `EffectMiscValueB2`, `EffectMiscValueB3`, `EffectTriggerSpell1`, `EffectTriggerSpell2`, `EffectTriggerSpell3`, `EffectSpellClassMaskA1`, `EffectSpellClassMaskA2`, `EffectSpellClassMaskA3`, `EffectSpellClassMaskB1`, `EffectSpellClassMaskB2`, `EffectSpellClassMaskB3`, `EffectSpellClassMaskC1`, `EffectSpellClassMaskC2`, `EffectSpellClassMaskC3`, `MaxTargetLevel`, `SpellFamilyName`, `SpellFamilyFlags1`, `SpellFamilyFlags2`, `SpellFamilyFlags3`, `MaxAffectedTargets`, `DmgClass`, `PreventionType`, `DmgMultiplier1`, `DmgMultiplier2`, `DmgMultiplier3`, `AreaGroupId`, `SchoolMask`, `Comment`) VALUES 
+(13377, 1, 0, 2512, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 101, 0, 0, 40, 40, 21, 1, 0, -1, -1, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 21, 0, 0, 0, 0, 0, 0, 0, 0, 23, 0, 0, 3000, 0, 0, '0', '0', '0', 0, 0, 0, 0, 0, 0, 13376, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 2, 'Fire Shield');
diff --git a/sql/updates/world/2012_05_26_02_world_creature_template.sql b/sql/updates/world/2012_05_26_02_world_creature_template.sql
new file mode 100644
index 00000000000..e51567390b7
--- /dev/null
+++ b/sql/updates/world/2012_05_26_02_world_creature_template.sql
@@ -0,0 +1,5 @@
+-- Training dummies
+UPDATE `creature_template` SET
+    `flags_extra`=0x40000, /* NO_SKILLGAIN */
+    `mechanic_immune_mask`=0x20|0x4000 /* GRIP|BLEED */ /* two of the templates already had bleed immunity, is that correct? */
+WHERE `ScriptName`='npc_training_dummy';
diff --git a/sql/updates/world/2012_05_26_03_world_page_text.sql b/sql/updates/world/2012_05_26_03_world_page_text.sql
new file mode 100644
index 00000000000..9dc285cd99d
--- /dev/null
+++ b/sql/updates/world/2012_05_26_03_world_page_text.sql
@@ -0,0 +1,4 @@
+-- First page of A Steamy Romance Novel: Northern Exposure
+DELETE FROM `page_text` WHERE `entry`=3562;
+INSERT INTO `page_text` (`entry`, `text`, `next_page`) VALUES
+(3562, 'The tiny gnome peered over the railing into the secluded Dalaran courtyard.$B$B"The view from the balcony is amazing.  You have to come see!"$B$BArmor legplates creaked as Marcus walked over, taking in a deep breath as he absently scratched his scruffy chin.$B$B"The Hero''s Welcome is no slouch.  And there''s something in the room that might interest you."$B$BTavi bounded into the room, pausing only a moment before jumping onto the massive bed.  She turned to gaze at Marcus with her huge saucer-like eyes, narrowing them playfully and replacing her glowing smile with a diabolical grin.', 3563);
diff --git a/sql/updates/world/2012_05_26_04_world_creature_template.sql b/sql/updates/world/2012_05_26_04_world_creature_template.sql
new file mode 100644
index 00000000000..911cd45ef8c
--- /dev/null
+++ b/sql/updates/world/2012_05_26_04_world_creature_template.sql
@@ -0,0 +1,4 @@
+-- Training dummies
+UPDATE `creature_template` SET
+    `mechanic_immune_mask` = `mechanic_immune_mask` &~ 0x4000 /* BLEED */
+WHERE `ScriptName`='npc_training_dummy';
diff --git a/sql/updates/world/2012_05_26_05_world_creature_template.sql b/sql/updates/world/2012_05_26_05_world_creature_template.sql
new file mode 100644
index 00000000000..59d69b3fbe1
--- /dev/null
+++ b/sql/updates/world/2012_05_26_05_world_creature_template.sql
@@ -0,0 +1,8 @@
+-- Blade's Edge - Legion - Invis Bunny
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=20736;
+-- Death's Door Warp-Gate Explosion Bunny
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=22502;
+-- Death's Door North Warp-Gate
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=22471;
+-- Death's Door South Warp-Gate
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE `entry`=22472;
diff --git a/sql/updates/world/2012_05_26_06_world_smart_scripts.sql b/sql/updates/world/2012_05_26_06_world_smart_scripts.sql
new file mode 100644
index 00000000000..397a5ad517a
--- /dev/null
+++ b/sql/updates/world/2012_05_26_06_world_smart_scripts.sql
@@ -0,0 +1,143 @@
+-- Blackhand Dreadweaver <Blackhand Legion> SAI
+SET @ENTRY   := 9817;  -- NPC entry
+SET @SPELL1  := 12739; -- Shadow Bolt
+SET @SPELL2  := 7068;  -- Veil of Shadow
+SET @SPELL3  := 12380; -- Shadow Channeling
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM creature_ai_scripts WHERE creature_id=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,11,0,100,2,0,0,0,0,58,1,@SPELL1,3600,6300,25,30,1,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - On Reset - Load caster template Cast Shadow Bolt'),
+(@ENTRY,0,1,0,25,0,100,0,0,0,0,0,11,@SPELL3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - On Reset - Aura Shadow Channeling'),
+(@ENTRY,0,2,3,4,0,100,2,0,0,0,0,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - On Aggro - Cast Shadow Bolt'),
+(@ENTRY,0,3,0,61,0,100,2,0,0,0,0,39,10,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - On Aggro - Call for help'),
+(@ENTRY,0,4,0,0,0,100,2,9400,21400,22000,28800,11,@SPELL2,3,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - Combat - Cast Veil of Shadow'),
+(@ENTRY,0,5,0,2,0,100,3,0,15,0,0,25,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - HP@15% - Flee for help'),
+(@ENTRY,0,6,7,1,0,100,2,0,8000,12000,14000,92,0,0,1,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - OOC - interupt channeling'),
+(@ENTRY,0,7,0,61,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - OOC - set phase 1'),
+(@ENTRY,0,8,0,1,1,100,2,0,0,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - OOC - emote (phase 1)'),
+(@ENTRY,0,9,10,1,1,100,2,4000,4000,4000,4000,11,@SPELL3,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - OOC - Aura Shadow Channeling (phase 1)'),
+(@ENTRY,0,10,0,61,1,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Dreadweaver - OOC - set phase 0 (phase 1)');
+
+-- Blackhand Summoner <Blackhand Legion> SAI
+SET @ENTRY   := 9818;  -- NPC entry
+SET @SPELL1  := 12466; -- Fireball
+SET @SPELL2  := 15532; -- Frost Nova
+SET @SPELL3  := 15792; -- Summon Blackhand Veteran
+SET @SPELL4  := 15794; -- Summon Blackhand Dreadweaver
+SET @SPELL5  := 12380; -- Shadow Channeling
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM creature_ai_scripts WHERE creature_id=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,11,0,100,2,0,0,0,0,58,1,@SPELL1,3600,6300,25,30,1,0,0,0,0,0,0,0, 'Blackhand Summoner - On Reset - Load caster template Cast Fireball'),
+(@ENTRY,0,1,0,25,0,100,0,0,0,0,0,11,@SPELL5,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Summoner - On Reset - Aura Shadow Channeling'),
+(@ENTRY,0,2,3,4,0,100,2,0,0,0,0,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Blackhand Summoner - On Aggro - Cast Shadow Bolt'),
+(@ENTRY,0,3,0,61,0,100,2,0,0,0,0,39,10,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Summoner - On Aggro - Call for help'),
+(@ENTRY,0,4,0,0,0,100,2,11400,11400,12700,16700,11,@SPELL2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Summoner - Combat - Cast Frost Nova'),
+(@ENTRY,0,5,6,0,0,100,3,30000,35000,0,0,11,@SPELL3,1,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Summoner - Combat - Cast Summon Blackhand Veteran'),
+(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Summoner - Combat - say 0'),
+(@ENTRY,0,7,8,0,0,100,3,40000,45000,0,0,11,@SPELL4,1,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Summoner - Combat - Cast Summon Blackhand Dreadweaver'),
+(@ENTRY,0,8,0,61,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Summoner - Combat - say 1'),
+(@ENTRY,0,9,0,2,0,100,3,0,15,0,0,25,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Summoner - HP@15% - Flee for help'),
+(@ENTRY,0,10,0,1,0,100,2,0,8000,12000,14000,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Summoner - OOC - emote');
+-- NPC talk text insert
+DELETE FROM `creature_text` WHERE `entry`=9818;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(9818,0,0,'%s begins to summon in a Blackhand Veteran!',16,0,100,0,0,0,'Blackhand Summoner'),
+(9818,1,0,'%s begins to summon in a Blackhand Dreadweaver!',16,0,100,0,0,0,'Blackhand Summoner');
+
+-- Blackhand Veteran <Blackhand Legion> SAI
+SET @ENTRY   := 9819;  -- NPC entry
+SET @SPELL1  := 15749; -- Shield Charge
+SET @SPELL2  := 14516; -- Strike
+SET @SPELL3  := 11972; -- Shield Bash
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM creature_ai_scripts WHERE creature_id=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,4,0,100,2,0,0,0,0,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Blackhand Veteran - On Aggro - Cast Shield Charge'),
+(@ENTRY,0,1,0,61,0,100,2,0,0,0,0,39,10,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Veteran - On Aggro - Call for help'),
+(@ENTRY,0,2,0,0,0,100,2,7800,15800,13800,22900,11,@SPELL2,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Blackhand Veteran - Combat - Cast Veil of Shadow'),
+(@ENTRY,0,3,0,0,0,100,2,10000,20000,6000,12000,11,@SPELL3,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Blackhand Veteran - Combat - Cast Veil of Shadow'),
+(@ENTRY,0,4,0,2,0,100,3,0,15,0,0,25,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Veteran - HP@15% - Flee for help'),
+(@ENTRY,0,5,0,1,0,100,2,0,8000,12000,14000,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Veteran - OOC - emote');
+
+-- Rage Talon Dragonspawn SAI
+SET @ENTRY   := 9096;  -- NPC entry 
+SET @SPELL1  := 15580; -- Strike
+SET @SPELL2  := 12021; -- Fixate
+SET @SPELL3  := 15572; -- Sunder Armor
+SET @SPELL4  := 3391; -- Thrash
+SET @SPELL5  := 8269; -- Frenzy
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM creature_ai_scripts WHERE creature_id=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,2,4000,13200,6600,14400,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Rage Talon Dragonspawn - Combat - Cast Strike'),
+(@ENTRY,0,1,0,0,0,100,2,7700,17100,20300,34200,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Rage Talon Dragonspawn - Combat - Cast Fixate'),
+(@ENTRY,0,2,0,0,0,100,2,1400,12300,7100,11700,11,@SPELL3,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Rage Talon Dragonspawn - Combat - Cast Sunder Armor'),
+(@ENTRY,0,3,0,0,0,100,2,8200,17100,5600,18100,11,@SPELL4,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Rage Talon Dragonspawn - Combat - Cast Thrash'),
+(@ENTRY,0,4,5,2,0,100,2,0,30,120000,120000,11,@SPELL5,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Rage Talon Dragonspawn - HP@30% - Cast Frenzy'),
+(@ENTRY,0,5,0,61,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Summoner - HP@30% - say 0');
+-- NPC talk text insert
+DELETE FROM `creature_text` WHERE `entry`=9096;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(9096,0,0,'%s goes into a frenzy!',16,0,100,0,0,0,'Rage Talon Dragonspawn');
+
+ -- Scarshield Legionnaire <Scarshield Legion> SAI
+SET @ENTRY   := 9097;  -- NPC entry
+SET @SPELL1  := 15496; -- Cleave
+SET @SPELL2  := 11972; -- Shield Bash
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM creature_ai_scripts WHERE creature_id=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,4,0,100,2,0,0,0,0,39,10,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Scarshield Legionnaire - On Aggro - Call for help'),
+(@ENTRY,0,1,0,0,0,100,2,7800,11500,8000,22100,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Scarshield Legionnaire -  Combat - Cast Cleave'),
+(@ENTRY,0,2,0,0,0,100,2,4000,10000,14000,20000,11,@SPELL2,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Scarshield Legionnaire -  Combat - Cast Shield Bash');
+
+-- Scarshield Acolyte <Scarshield Legion> SAI
+SET @ENTRY   := 9045;  -- NPC entry
+SET @SPELL1  := 14032; -- Shadow Word: Pain
+SET @SPELL2  := 12039; -- Heal
+SET @SPELL3  := 8362;  -- Renew
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM creature_ai_scripts WHERE creature_id=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,4,0,100,2,0,0,0,0,39,10,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Scarshield Acolyte - On Aggro - Call for help'),
+(@ENTRY,0,1,0,0,0,100,2,7700,15700,21900,33500,11,@SPELL1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Scarshield Acolyte - Combat - Cast Shadow Word: Pain'),
+(@ENTRY,0,2,0,2,0,100,3,0,75,0,0,11,@SPELL2,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Scarshield Acolyte -  HP@75% - Cast Heal'),
+(@ENTRY,0,3,0,14,0,100,2,35,8,5000,6000,11,@SPELL3,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Scarshield Acolyte -  Friendly hp@35 - Cast Renew on friendly unit');
+
+-- Scarshield Spellbinder <Scarshield Legion> SAI
+SET @ENTRY   := 9098;  -- NPC entry
+SET @SPELL1  := 13748; -- Arcane Bolt
+SET @SPELL2  := 15123; -- Resist Fire
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM creature_ai_scripts WHERE creature_id=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,11,0,100,2,0,0,0,0,58,1,@SPELL1,1100,3000,30,30,1,0,0,0,0,0,0,0, 'Scarshield Spellbinder - On Reset - Load caster template Cast Arcane Bolt'),
+(@ENTRY,0,1,0,4,0,100,2,0,0,0,0,39,10,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Scarshield Spellbinder - On Aggro - Call for help'),
+(@ENTRY,0,2,0,16,0,100,2,@SPELL2,30,3000,6000,11,@SPELL2,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Blackhand Summoner - Combat - Cast Resist Fire');
+
+-- Blackhand Incarcerator SAI
+SET @ENTRY   := 10316; -- NPC entry
+SET @SPELL1  := 15281; -- Encage Emberseer
+SET @SPELL2  := 12039; -- Heal
+SET @SPELL3  := 8362;  -- Renew
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM creature_ai_scripts WHERE creature_id=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,1,0,100,3,1000,1000,1000,1000,11,@SPELL1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Incarcerator - OOC -  Cast Encage Emberseer'),
+(@ENTRY,0,1,2,38,0,100,2,0,1,0,0,92,0,@SPELL1,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Incarcerator - On data set -  Stop Casting Encage Emberseer'),
+(@ENTRY,0,2,4,61,0,100,0,0,0,0,0,19,768,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Incarcerator - On data set -  Remove unit flags'),
+(@ENTRY,0,3,4,4,0,100,2,0,0,0,0,9,0,0,0,0,0,0,15,175244,100,0,0,0,0,0, 'Blackhand Incarcerator - On aggro -  close emberseer in door'),
+(@ENTRY,0,4,0,61,0,100,0,0,0,0,0,9,0,0,0,0,0,0,15,175705,100,0,0,0,0,0, 'Blackhand Incarcerator - On aggro -  close doors'),
+(@ENTRY,0,5,0,0,0,100,2,7800,15800,13800,22900,11,@SPELL2,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Blackhand Incarcerator - Combat - Cast Strike'),
+(@ENTRY,0,6,0,0,0,100,2,10000,20000,6000,12000,11,@SPELL3,0,0,0,0,0,5,0,0,0,0,0,0,0, 'Blackhand Incarcerator - Combat - Cast Encage'),
+(@ENTRY,0,7,0,2,0,100,3,0,15,0,0,25,1,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Incarcerator - HP@15% - Flee for help'),
+(@ENTRY,0,8,0,6,0,100,0,0,0,0,0,41,10000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Blackhand Incarcerator - On death - Despawn after 10 sec');
diff --git a/sql/updates/world/2012_05_27_00_world_gameobject_template.sql b/sql/updates/world/2012_05_27_00_world_gameobject_template.sql
new file mode 100644
index 00000000000..5fa3c15a505
--- /dev/null
+++ b/sql/updates/world/2012_05_27_00_world_gameobject_template.sql
@@ -0,0 +1,7 @@
+-- Gameobject updates based on sniffs
+UPDATE `gameobject_template` SET `size` =2.5,`questItem1`=30876,`data0`=57,`data1`=21583 WHERE `entry`=185032;
+UPDATE `gameobject` SET `position_x`=-3420.991,`position_y`=1373.175,`position_z`=257.5233,`orientation`=3.141593 WHERE `id`=185032;
+-- Gameobject loot template
+DELETE FROM `gameobject_loot_template` WHERE `entry`=21583;
+INSERT INTO `gameobject_loot_template` VALUES
+(21583,30876,100,1,0,1,1); -- Quenched Illidari-Bane Blade
diff --git a/sql/updates/world/2012_05_27_01_world_waypoints.sql b/sql/updates/world/2012_05_27_01_world_waypoints.sql
new file mode 100644
index 00000000000..3685b58a629
--- /dev/null
+++ b/sql/updates/world/2012_05_27_01_world_waypoints.sql
@@ -0,0 +1,7 @@
+-- RE FIX Reanimated Frost Wyrm
+DELETE FROM `creature` WHERE `guid` IN (116670,116671,116672,116681,116683,116684,116685,116686,116687,116696,116697,116699,116700,116701);
+UPDATE `creature` SET `MovementType`=2 WHERE `guid` BETWEEN 40497 AND 40505;
+UPDATE `creature_addon` SET `bytes1`=50331648,`bytes2`=1 WHERE `guid` BETWEEN 40497 AND 40505;
+-- Fix Wildhammer Scout
+UPDATE `creature` SET `MovementType`=0 WHERE guid IN (69122,69123,69124,69125,69126,69127);
+UPDATE `creature_addon` SET `path_id`=0 WHERE guid IN (69122,69123,69124,69125,69126,69127);
diff --git a/sql/updates/world/2012_05_27_02_world_creature.sql b/sql/updates/world/2012_05_27_02_world_creature.sql
new file mode 100644
index 00000000000..8ca3ee75c94
--- /dev/null
+++ b/sql/updates/world/2012_05_27_02_world_creature.sql
@@ -0,0 +1,4 @@
+-- Add Missing spawn for Queen Angerboda
+DELETE FROM `creature` WHERE `id`=24023; 
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
+(42162,24023,571,1,1,0,0,2855.372,-3869.662,248.6132,2.181662,150,0,0,9291,3231,0,0,0,0);
diff --git a/sql/updates/world/2012_05_27_03_world_creature.sql b/sql/updates/world/2012_05_27_03_world_creature.sql
new file mode 100644
index 00000000000..097f40581a7
--- /dev/null
+++ b/sql/updates/world/2012_05_27_03_world_creature.sql
@@ -0,0 +1,2 @@
+-- Remove Spawns for Compact Harvest Reaper, it should be spawned via script
+DELETE FROM `creature` WHERE `id`=2676;
diff --git a/sql/updates/world/2012_05_27_04_world_smart_scripts.sql b/sql/updates/world/2012_05_27_04_world_smart_scripts.sql
new file mode 100644
index 00000000000..1f7cfa3d19c
--- /dev/null
+++ b/sql/updates/world/2012_05_27_04_world_smart_scripts.sql
@@ -0,0 +1,24 @@
+-- Reconstructed Wyrm SAI
+SET @ENTRY  := 27693;
+SET @SPELL1 := 49386; -- Not in dbc
+SET @SPELL2 := 49343; -- Frost Breath Strafe
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,11,@SPELL2,0,0,0,0,0,1,0,0,0,0,0,0,0,'Reconstructed Wyrm - On spawn - cast aura'),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,53,0,@ENTRY,0,0,0,0,1,0,0,0,0,0,0,0,'Reconstructed Wyrm - On spawn - Load Path');
+-- waypoints for Reconstructed Wyrm
+DELETE FROM `waypoints` WHERE `entry` IN (@ENTRY); 
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(@ENTRY,1,4685.845,1130.759,150.1177, 'Reconstructed Wyrm'),
+(@ENTRY,2,4686.284,1131.658,150.1177, 'Reconstructed Wyrm'),
+(@ENTRY,3,4688.699,1166.089,161.2737, 'Reconstructed Wyrm'),
+(@ENTRY,4,4702.308,1212.668,161.2737, 'Reconstructed Wyrm'),
+(@ENTRY,5,4733.535,1260.209,169.6348, 'Reconstructed Wyrm'),
+(@ENTRY,6,4751.818,1293.699,175.9404, 'Reconstructed Wyrm'),
+(@ENTRY,7,4794.479,1345.154,199.5372, 'Reconstructed Wyrm'),
+(@ENTRY,8,4812.264,1373.523,219.8613, 'Reconstructed Wyrm');
+-- Fix spawns
+UPDATE `creature` SET `position_x`=4685.845,`position_y`=1130.759,`position_z`=150.1177,`spawntimesecs`=120,`spawndist`=0,`MovementType`=0 WHERE `guid`=100211;
+DELETE FROM `creature` WHERE `guid` IN (100256,133240,133241);
+DELETE FROM `creature_addon` WHERE `guid` IN (100256,133240,133241);
diff --git a/sql/updates/world/2012_05_27_05_world_gameobject.sql b/sql/updates/world/2012_05_27_05_world_gameobject.sql
new file mode 100644
index 00000000000..66fbfd0afca
--- /dev/null
+++ b/sql/updates/world/2012_05_27_05_world_gameobject.sql
@@ -0,0 +1,13 @@
+-- [QUEST] Attunement to Dalaran
+SET @GUID := 320;
+-- Adds the gameobject to recognize the zone
+DELETE FROM `gameobject` WHERE `id`=300193;
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`)
+VALUES
+(@GUID,300193,571,1,1,3343.8,2502.85,-15.1381,5.74342,0,0,0.266617,-0.963802,300,0,1);
+-- [SAI] NPC Attunement To Dalaran Kill Credit Bunny 27135
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=27135;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=27135 AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`)
+VALUES
+(27135,0,0,0,8,0,100,1,48021,1,0,0,33,27135,0,0,0,0,0,7,0,0,0,0,0,0,0, 'On spellhit - give kill credit - Attunement to Dalaran Kill Credit Bunny');
diff --git a/sql/updates/world/2012_05_27_06_world_creature.sql b/sql/updates/world/2012_05_27_06_world_creature.sql
new file mode 100644
index 00000000000..1074465a0be
--- /dev/null
+++ b/sql/updates/world/2012_05_27_06_world_creature.sql
@@ -0,0 +1,113 @@
+-- Tukemuth
+DELETE FROM `smart_scripts` WHERE `entryorguid`=32400;
+INSERT INTO `smart_scripts` VALUES 
+(32400,0,0,0,9,0,100,0,0,5,9000,13000,11,50410,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Tukemuth - Cast Tusk Strike'),
+(32400,0,1,0,0,0,100,0,9000,17000,15000,22000,11,57066,0,0,0,0,0,0,0,0,0,0,0,0,0, 'Tukemuth - Cast Trample');
+UPDATE `creature_template` SET faction_A=7,faction_H=7,mindmg=2926.0,maxdmg=3542.0,skinloot=70209,spell1=50410,spell2=57066,attackpower=3384,dmg_multiplier=1.0,AIName= 'SmartAI',mechanic_immune_mask=2147483647 where entry=32400;
+
+-- Fumblub Gearwind
+DELETE FROM `smart_scripts` WHERE `entryorguid`=32358;
+INSERT INTO `smart_scripts` VALUES 
+(32358,0,0,0,0,0,100,0,4000,6000,12000,15000,11,60906,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Fumblub Gearwind - Cast Machine Gun');
+UPDATE `creature_template` SET faction_A=14,faction_H=14,mindmg=2792,maxdmg=3376,spell1=60906,attackpower=3384,dmg_multiplier=1.0,AIName= 'SmartAI',mechanic_immune_mask=2147483647,type_flags=2048,InhabitType=4 where entry=32358;
+UPDATE `creature_addon` SET mount=22719,bytes1=33554432 where guid=151938;
+
+-- Old Crystalbark
+DELETE FROM `smart_scripts` WHERE `entryorguid`=32357;
+INSERT INTO `smart_scripts` VALUES
+(32357,0,0,0,0,0,100,0,3700,16200,19200,28000,11,50506,0,0,0,0,0,0,0,0,0,0,0,0,0, 'Old Crystalbark - Cast Mark of Detonation'),
+(32357,0,1,0,0,0,100,0,1625,8100,9600,14000,11,60903,0,0,0,0,0,0,0,0,0,0,0,0,0, 'Old Crystalbark - Cast Arcane Breath');
+UPDATE `creature_template` SET faction_A=14,faction_H=14,mindmg=3231.0,maxdmg=3309.0,spell1=60903,spell2=50506,attackpower=3214,dmg_multiplier=1.0,AIName= 'SmartAI',mechanic_immune_mask=2147483647 where entry=32357;
+
+-- Terror Spinner - Tameable
+DELETE FROM `smart_scripts` WHERE `entryorguid`=32475;
+INSERT INTO `smart_scripts` VALUES
+(32475,0,0,0,0,0,100,0,4000,6000,12000,15000,11,36839,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Terror Spinner - Cast Impairing Poison'),
+(32475,0,1,0,0,0,100,0,1625,8100,9600,14000,11,28428,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Terror Spinner - Cast Instant Poison');
+UPDATE `creature_template` SET faction_A=14,faction_H=14,mindmg=3625.0,maxdmg=4301.0,spell1=32475,spell2=28428,attackpower=3963,dmg_multiplier=1.0,AIName= 'SmartAI',mechanic_immune_mask=66624,name= 'Terror Spinner' where entry=32475;
+
+-- Hildana Deathstealer
+DELETE FROM `smart_scripts` WHERE `entryorguid`=32495;
+INSERT INTO `smart_scripts` VALUES
+(32495,0,0,0,0,0,100,1,0,0,0,0,22,1,0,0,0,0,0,0,0,0,0,0,0,0,0, 'Hildana Deathstealer - Enter phase 1'),
+(32495,0,1,2,0,1,100,0,3000,6000,4000,6000,11,60991,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Hildana Deathstealer - Cast Lash'),
+(32495,0,2,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,0,0,0,0,0,0,0,0, 'Hildana Deathstealer - Enter phase 2'),
+(32495,0,3,0,0,2,100,0,3000,5000,9000,11000,11,57547,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Hildana Deathstealer - Cast Touch of the Valkyr'),
+(32495,0,4,0,0,2,100,0,12000,13000,13000,15000,22,1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Hildana Deathstealer - timer back to phase 1');
+UPDATE `creature_template` SET faction_A=14,faction_H=14,mindmg=4715,maxdmg=5474,attackpower=5094,dmg_multiplier=1.0,AIName= 'SmartAI',mechanic_immune_mask=2147483647 where entry=32495;
+
+-- Syreian the Bonecarver
+UPDATE `creature_template` SET faction_A=14,faction_H=14,mindmg=2926,maxdmg=3542,spell1=38952,spell2=47168,spell3=50092,attackpower=3234,dmg_multiplier=1.0,mechanic_immune_mask=2147483647 where entry=32438;
+
+-- Icehorn - Tameable
+DELETE FROM `smart_scripts` WHERE `entryorguid`=32361;
+INSERT INTO `smart_scripts` VALUES
+(32361,0,0,0,0,0,100,0,4500,6750,6750,9750,11,57468,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Icehorn - Cast Romp');
+UPDATE `creature_template` SET type_flags= '1',faction_A=14,faction_H=14,mindmg=2792,maxdmg=3376,spell1=57468,attackpower=3084,dmg_multiplier=1.0,AIName= 'SmartAI',mechanic_immune_mask=66624,skinloot=70211 where entry=32361;
+
+-- King Ping
+DELETE FROM `smart_scripts` WHERE `entryorguid`=32398;
+INSERT INTO `smart_scripts` VALUES
+(32398,0,0,0,0,0,100,0,1600,8000,12400,13000,11,61115,0,0,0,0,0,2,0,0,0,0,0,0,0, 'King Ping - Cast Belly Flop'),
+(32398,0,1,0,0,0,100,0,800,2600,4200,6800,11,50169,0,0,0,0,0,2,0,0,0,0,0,0,0, 'King Ping - Cast Flipper Thwack');
+UPDATE `creature_template` SET faction_A=14,faction_H=14,mindmg=2792,maxdmg=3376,spell1=61115,spell2=50169,attackpower=3234,dmg_multiplier=1.0,AIName= 'SmartAI',mechanic_immune_mask=2147483647 WHERE entry=32398;
+
+-- High Thane Jorfus
+DELETE FROM `smart_scripts` WHERE `entryorguid`=32501;
+INSERT INTO `smart_scripts` VALUES
+(32501,0,0,0,0,0,100,0,1600,3200,6400,12800,11,60950,0,0,0,0,0,2,0,0,0,0,0,0,0, 'High Thane Jorfus - Cast Blood Plague'),
+(32501,0,1,0,0,0,100,2,10000,20000,10000,20000,11,60945,0,0,0,0,0,2,0,0,0,0,0,0,0, 'High Thane Jorfus - Cast Blood Strike'),
+(32501,0,2,0,0,0,100,0,8000,13000,16000,21000,11,60953,1,0,0,0,0,5,0,0,0,0,0,0,0, 'High Thane Jorfus - Cast Death and Decaye'),
+(32501,0,3,0,0,0,100,4,1000,1400,8500,20500,11,60949,0,0,0,0,0,5,0,0,0,0,0,0,0, 'High Thane Jorfus - Cast Death Coil'),
+(32501,0,4,0,0,0,100,2,5000,9000,15000,22000,11,60951,0,0,0,0,0,2,0,0,0,0,0,0,0, 'High Thane Jorfus - Cast Frost Strike');
+UPDATE `creature_template` set faction_A=14,faction_H=14,mindmg=4894,maxdmg=5649,spell1=60950,spell2=60945,spell3=60953,spell4=60949,spell5=60951,attackpower=5271,dmg_multiplier=1.0,AIName= 'SmartAI',mechanic_immune_mask=2147483647 WHERE entry=32501;
+
+-- Perobas the Bloodthirster
+DELETE FROM `smart_scripts` WHERE `entryorguid`=32377;
+INSERT INTO `smart_scripts` VALUES
+(32377,0,0,0,0,0,100,0,5000,8000,12000,15000,11,50046,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Perobas the Bloodthirster - Cast Gnaw Bone'),
+(32377,0,1,0,2,0,100,0,0,50,10000,13000,11,50271,1,0,0,0,0,1,0,0,0,0,0,0,0, 'Perobas the Bloodthirster - Cast Killing Rage');
+UPDATE `creature_template` set faction_A=14,faction_H=14,mindmg=2792,maxdmg=3376,spell1=50046,spell2=52071,attackpower=3084,dmg_multiplier=1.0,AIName= 'SmartAI',mechanic_immune_mask=66624,skinloot=70209 where entry=32377;
+
+-- Aotona - Tameable
+UPDATE `creature` SET curhealth=15952  where id=32481;
+UPDATE `creature_template` SET exp=2,armor_mod=1.0,minlevel=75,maxlevel=75,faction_A=14,faction_H=14,mindmg=3376,maxdmg=4034,spell1=49865,spell2=51144,attackpower=3705,dmg_multiplier=1.0,mechanic_immune_mask=66624 where entry=32481;
+
+--  Griegen
+DELETE FROM `smart_scripts` WHERE `entryorguid`=32471;
+INSERT INTO `smart_scripts` VALUES
+(32471,0,0,0,0,0,100,0,5000,8000,9000,12000,11,51334,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Griegen - Cast Smash');
+UPDATE `creature` set curhealth=15952  where id=32471;
+UPDATE `creature_template` set exp=2,armor_mod=1.0,minlevel=75,maxlevel=75,faction_A=14,faction_H=14,mindmg=3376,maxdmg=4034,spell1=51334,attackpower=3705,dmg_multiplier=1.0,AIName= 'SmartAI',mechanic_immune_mask=2147483647 where entry=32471;
+
+-- Seething Hate
+UPDATE `creature_template` SET mindmg=2926,maxdmg=3542,attackpower=3234,dmg_multiplier=1.0,mechanic_immune_mask=66624 WHERE entry=32429;
+
+-- Vigdis the War Maiden
+DELETE FROM `creature_template_addon` WHERE entry=32386;
+INSERT INTO `creature_template_addon` VALUES
+(32386,0,28040,0,0,0,NULL);
+UPDATE `creature` SET spawndist=20.0,MovementType=1 WHERE id=32386;
+UPDATE `creature_template` SET faction_A=14,faction_H=14,mindmg=2792,maxdmg=3376,attackpower=3084,dmg_multiplier=1.0,mechanic_immune_mask=2147483647,InhabitType=1 where entry=32386;
+
+-- King Krush - Tameable
+UPDATE `creature_template` SET faction_A=14,faction_H=14,mechanic_immune_mask=66624 WHERE entry=32485;
+
+-- Scarlet Highlord Daion
+UPDATE `creature_template` SET faction_A=14,faction_H=14,mindmg=2926,maxdmg=3542,attackpower=3234,dmg_multiplier=1.0,mechanic_immune_mask=66624 WHERE entry=32417;
+
+-- Crazed Indu'le Survivor
+UPDATE `creature_template` SET mindmg=2926,maxdmg=3542,attackpower=3234,dmg_multiplier=1.0,mechanic_immune_mask=66624 WHERE entry=32409;
+
+-- Grocklar
+UPDATE `creature_template` SET mindmg=3137,maxdmg=3777,attackpower=3457,dmg_multiplier=1.0,mechanic_immune_mask=66624 WHERE entry=32422;
+
+-- Loque'nahak - Tameable
+UPDATE `creature_template` SET type_flags= '1',mechanic_immune_mask=66624 WHERE entry=32422;
+
+-- Zuldrak Sentinel
+DELETE FROM `smart_scripts` WHERE `entryorguid`=32447;
+INSERT INTO `smart_scripts` VALUES 
+(32447,0,0,0,0,0,100,0,0,5,9000,13000,11,55196,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Zuldrak Sentinel - Cast Stomp'),
+(32447,0,1,0,0,0,100,0,15000,20000,21000,35000,11,54565,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Zuldrak Sentinel - Cast Whammy');
+UPDATE `creature_template` SET mindmg= '3905',maxdmg= '4600',attackpower= '4252',dmg_multiplier= '1.0',mechanic_immune_mask= '66624',spell1= '54565',spell2= '55196',AIName= 'SmartAI' WHERE entry= '32447';
diff --git a/sql/updates/world/2012_05_27_07_world_game_event.sql b/sql/updates/world/2012_05_27_07_world_game_event.sql
new file mode 100644
index 00000000000..eff4a9e7652
--- /dev/null
+++ b/sql/updates/world/2012_05_27_07_world_game_event.sql
@@ -0,0 +1,8 @@
+UPDATE `game_event` SET `start_time` ='2012-06-21 00:01:00' WHERE `eventEntry`=1;  -- Midsummer Fire Festival
+UPDATE `game_event` SET `start_time` ='2012-09-19 00:01:00' WHERE `eventEntry`=50; -- Pirates' Day
+UPDATE `game_event` SET `start_time` ='2012-09-20 00:01:00' WHERE `eventEntry`=24; -- Brewfest
+UPDATE `game_event` SET `start_time` ='2012-09-24 00:01:00' WHERE `eventEntry`=11; -- Harvest Festival
+UPDATE `game_event` SET `start_time` ='2012-09-18 01:00:00' WHERE `eventEntry`=11; -- Hallow's End
+UPDATE `game_event` SET `start_time` ='2012-11-01 01:00:00' WHERE `eventEntry`=51; -- Day of the Dead
+UPDATE `game_event` SET `start_time` ='2012-11-18 01:00:00' WHERE `eventEntry`=26; -- Pilgrim's Bounty
+UPDATE `game_event` SET `start_time` ='2012-12-15 06:00:00' WHERE `eventEntry`=2;  -- Winter Veil
diff --git a/sql/updates/world/2012_05_27_07_world_waypoints.sql b/sql/updates/world/2012_05_27_07_world_waypoints.sql
new file mode 100644
index 00000000000..bd6aa2d0fc1
--- /dev/null
+++ b/sql/updates/world/2012_05_27_07_world_waypoints.sql
@@ -0,0 +1,8 @@
+-- Fix pathing for Thiassi the Lightning Bringer
+DELETE FROM `creature_addon` WHERE `guid`=106554;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`) VALUES (106554,1065540,1);
+
+-- bio's screwed up movement for rares. Fix for some
+UPDATE `creature` SET `spawndist`=10,`MovementType`=1 WHERE `id` IN (32400,32417,32422,32429);
+UPDATE `creature_addon` SET `path_id`=2026020 WHERE `guid`=202602;
+UPDATE `waypoint_data` SET `id`=2026020 WHERE `id`=2500060;
diff --git a/sql/updates/world/2012_05_28_world_creature_ai_scripts.sql b/sql/updates/world/2012_05_28_world_creature_ai_scripts.sql
new file mode 100644
index 00000000000..aef4e4c6f67
--- /dev/null
+++ b/sql/updates/world/2012_05_28_world_creature_ai_scripts.sql
@@ -0,0 +1,9 @@
+-- Fix recent DB errors
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=27135; -- Attunement To Dalaran Kill Credit
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=32400; -- Tukemuth
+
+-- Fix recent DB errors (credits to Vincent-Michael)
+DELETE FROM `creature_addon` WHERE `guid` = 2593;
+DELETE FROM `creature_template_addon` WHERE `entry` = 2676;
+INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(2676,0,0,0,4097,0,NULL);