183 files changed, 99 insertions, 62 deletions

diff --git a/sql/updates/characters/2012_06_13_00_characters_character_equipmentsets.sql b/sql/old/3.3.5a/2012_06_13_00_characters_character_equipmentsets.sql
index ebf12062be3..ebf12062be3 100644
--- a/sql/updates/characters/2012_06_13_00_characters_character_equipmentsets.sql
+++ b/sql/old/3.3.5a/2012_06_13_00_characters_character_equipmentsets.sql
diff --git a/sql/updates/world/2012_07_12_00_world_version.sql b/sql/old/3.3.5a/2012_07_12_00_world_version.sql
index ce24fa54614..ce24fa54614 100644
--- a/sql/updates/world/2012_07_12_00_world_version.sql
+++ b/sql/old/3.3.5a/2012_07_12_00_world_version.sql
diff --git a/sql/updates/world/2012_07_13_00_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_07_13_00_world_spell_proc_event.sql
index 952a4502b30..952a4502b30 100644
--- a/sql/updates/world/2012_07_13_00_world_spell_proc_event.sql
+++ b/sql/old/3.3.5a/2012_07_13_00_world_spell_proc_event.sql
diff --git a/sql/updates/world/2012_07_13_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_07_13_00_world_spell_script_names.sql
index 64500418871..64500418871 100644
--- a/sql/updates/world/2012_07_13_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_07_13_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_07_14_00_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_07_14_00_world_creature_loot_template.sql
index f76e5519594..f76e5519594 100644
--- a/sql/updates/world/2012_07_14_00_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_07_14_00_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_07_14_01_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_07_14_01_world_creature_loot_template.sql
index 1b9c4f4448c..1b9c4f4448c 100644
--- a/sql/updates/world/2012_07_14_01_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_07_14_01_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_07_16_00_world_creature_template.sql b/sql/old/3.3.5a/2012_07_16_00_world_creature_template.sql
index 7ce7c546592..7ce7c546592 100644
--- a/sql/updates/world/2012_07_16_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_07_16_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_07_16_01_world_reference_loot_template.sql b/sql/old/3.3.5a/2012_07_16_01_world_reference_loot_template.sql
index e56dff3b0ea..e56dff3b0ea 100644
--- a/sql/updates/world/2012_07_16_01_world_reference_loot_template.sql
+++ b/sql/old/3.3.5a/2012_07_16_01_world_reference_loot_template.sql
diff --git a/sql/updates/world/2012_07_22_00_world_spelldifficulty_dbc.sql b/sql/old/3.3.5a/2012_07_22_00_world_spelldifficulty_dbc.sql
index c90c42692b9..c90c42692b9 100644
--- a/sql/updates/world/2012_07_22_00_world_spelldifficulty_dbc.sql
+++ b/sql/old/3.3.5a/2012_07_22_00_world_spelldifficulty_dbc.sql
diff --git a/sql/updates/world/2012_07_22_01_world_conditions.sql b/sql/old/3.3.5a/2012_07_22_01_world_conditions.sql
index 333ae7f997f..333ae7f997f 100644
--- a/sql/updates/world/2012_07_22_01_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_07_22_01_world_conditions.sql
diff --git a/sql/updates/world/2012_07_22_02_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_07_22_02_world_creature_loot_template.sql
index e4bc61b6fa4..e4bc61b6fa4 100644
--- a/sql/updates/world/2012_07_22_02_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_07_22_02_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_07_22_03_world_gossip.sql b/sql/old/3.3.5a/2012_07_22_03_world_gossip.sql
index d1aa7e50747..d1aa7e50747 100644
--- a/sql/updates/world/2012_07_22_03_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_07_22_03_world_gossip.sql
diff --git a/sql/updates/world/2012_07_22_04_world_gossip.sql b/sql/old/3.3.5a/2012_07_22_04_world_gossip.sql
index 0fbf2e7508f..0fbf2e7508f 100644
--- a/sql/updates/world/2012_07_22_04_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_07_22_04_world_gossip.sql
diff --git a/sql/updates/world/2012_07_22_05_world_script_texts.sql b/sql/old/3.3.5a/2012_07_22_05_world_script_texts.sql
index 2ecb1b8f130..2ecb1b8f130 100644
--- a/sql/updates/world/2012_07_22_05_world_script_texts.sql
+++ b/sql/old/3.3.5a/2012_07_22_05_world_script_texts.sql
diff --git a/sql/updates/world/2012_07_22_06_world_gossip.sql b/sql/old/3.3.5a/2012_07_22_06_world_gossip.sql
index 0cb41937d3c..0cb41937d3c 100644
--- a/sql/updates/world/2012_07_22_06_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_07_22_06_world_gossip.sql
diff --git a/sql/updates/world/2012_07_22_07_world_sai.sql b/sql/old/3.3.5a/2012_07_22_07_world_sai.sql
index f8f42ef07da..f8f42ef07da 100644
--- a/sql/updates/world/2012_07_22_07_world_sai.sql
+++ b/sql/old/3.3.5a/2012_07_22_07_world_sai.sql
diff --git a/sql/updates/world/2012_07_22_08_world_sai.sql b/sql/old/3.3.5a/2012_07_22_08_world_sai.sql
index 62b5a95f532..62b5a95f532 100644
--- a/sql/updates/world/2012_07_22_08_world_sai.sql
+++ b/sql/old/3.3.5a/2012_07_22_08_world_sai.sql
diff --git a/sql/updates/world/2012_07_22_09_world_creature_template.sql b/sql/old/3.3.5a/2012_07_22_09_world_creature_template.sql
index 909b4cc238b..909b4cc238b 100644
--- a/sql/updates/world/2012_07_22_09_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_07_22_09_world_creature_template.sql
diff --git a/sql/updates/world/2012_07_22_10_world_creature_onkill_rep.sql b/sql/old/3.3.5a/2012_07_22_10_world_creature_onkill_rep.sql
index 22d81bca548..22d81bca548 100644
--- a/sql/updates/world/2012_07_22_10_world_creature_onkill_rep.sql
+++ b/sql/old/3.3.5a/2012_07_22_10_world_creature_onkill_rep.sql
diff --git a/sql/updates/world/2012_07_22_11_world_conditions.sql b/sql/old/3.3.5a/2012_07_22_11_world_conditions.sql
index 9ecb28307ba..9ecb28307ba 100644
--- a/sql/updates/world/2012_07_22_11_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_07_22_11_world_conditions.sql
diff --git a/sql/updates/world/2012_07_22_12_world_creature_template.sql b/sql/old/3.3.5a/2012_07_22_12_world_creature_template.sql
index 51e2b36d15d..51e2b36d15d 100644
--- a/sql/updates/world/2012_07_22_12_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_07_22_12_world_creature_template.sql
diff --git a/sql/updates/world/2012_07_22_13_world_conditions.sql b/sql/old/3.3.5a/2012_07_22_13_world_conditions.sql
index 896257d3f92..896257d3f92 100644
--- a/sql/updates/world/2012_07_22_13_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_07_22_13_world_conditions.sql
diff --git a/sql/updates/world/2012_07_22_14_world_gameobject.sql b/sql/old/3.3.5a/2012_07_22_14_world_gameobject.sql
index bf77d1a625f..bf77d1a625f 100644
--- a/sql/updates/world/2012_07_22_14_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_07_22_14_world_gameobject.sql
diff --git a/sql/updates/world/2012_07_22_15_world_sai.sql b/sql/old/3.3.5a/2012_07_22_15_world_sai.sql
index 218eb9a3399..218eb9a3399 100644
--- a/sql/updates/world/2012_07_22_15_world_sai.sql
+++ b/sql/old/3.3.5a/2012_07_22_15_world_sai.sql
diff --git a/sql/updates/world/2012_07_29_00_world_factionchange.sql b/sql/old/3.3.5a/2012_07_29_00_world_factionchange.sql
index ca6c36630bc..ca6c36630bc 100644
--- a/sql/updates/world/2012_07_29_00_world_factionchange.sql
+++ b/sql/old/3.3.5a/2012_07_29_00_world_factionchange.sql
diff --git a/sql/updates/world/2012_07_29_01_world_pool_quest.sql b/sql/old/3.3.5a/2012_07_29_01_world_pool_quest.sql
index 0e0f192c8d7..0e0f192c8d7 100644
--- a/sql/updates/world/2012_07_29_01_world_pool_quest.sql
+++ b/sql/old/3.3.5a/2012_07_29_01_world_pool_quest.sql
diff --git a/sql/updates/world/2012_07_29_02_world_sai.sql b/sql/old/3.3.5a/2012_07_29_02_world_sai.sql
index 1a452576139..1a452576139 100644
--- a/sql/updates/world/2012_07_29_02_world_sai.sql
+++ b/sql/old/3.3.5a/2012_07_29_02_world_sai.sql
diff --git a/sql/updates/world/2012_07_29_03_world_sai.sql b/sql/old/3.3.5a/2012_07_29_03_world_sai.sql
index d8ca1b12390..d8ca1b12390 100644
--- a/sql/updates/world/2012_07_29_03_world_sai.sql
+++ b/sql/old/3.3.5a/2012_07_29_03_world_sai.sql
diff --git a/sql/updates/world/2012_07_29_04_world_sai.sql b/sql/old/3.3.5a/2012_07_29_04_world_sai.sql
index ef46c72f42c..ef46c72f42c 100644
--- a/sql/updates/world/2012_07_29_04_world_sai.sql
+++ b/sql/old/3.3.5a/2012_07_29_04_world_sai.sql
diff --git a/sql/updates/world/2012_07_29_05_world_sai.sql b/sql/old/3.3.5a/2012_07_29_05_world_sai.sql
index e1fd032eaca..e1fd032eaca 100644
--- a/sql/updates/world/2012_07_29_05_world_sai.sql
+++ b/sql/old/3.3.5a/2012_07_29_05_world_sai.sql
diff --git a/sql/updates/world/2012_07_29_06_world_sai.sql b/sql/old/3.3.5a/2012_07_29_06_world_sai.sql
index 03ebdfc6d0a..03ebdfc6d0a 100644
--- a/sql/updates/world/2012_07_29_06_world_sai.sql
+++ b/sql/old/3.3.5a/2012_07_29_06_world_sai.sql
diff --git a/sql/updates/world/2012_07_29_07_world_sai.sql b/sql/old/3.3.5a/2012_07_29_07_world_sai.sql
index 18de6d15c0a..18de6d15c0a 100644
--- a/sql/updates/world/2012_07_29_07_world_sai.sql
+++ b/sql/old/3.3.5a/2012_07_29_07_world_sai.sql
diff --git a/sql/updates/world/2012_07_29_08_world_sai.sql b/sql/old/3.3.5a/2012_07_29_08_world_sai.sql
index 796578d3f00..796578d3f00 100644
--- a/sql/updates/world/2012_07_29_08_world_sai.sql
+++ b/sql/old/3.3.5a/2012_07_29_08_world_sai.sql
diff --git a/sql/updates/world/2012_07_29_09_world_gossip_menu_option.sql b/sql/old/3.3.5a/2012_07_29_09_world_gossip_menu_option.sql
index 66474bdb5e4..66474bdb5e4 100644
--- a/sql/updates/world/2012_07_29_09_world_gossip_menu_option.sql
+++ b/sql/old/3.3.5a/2012_07_29_09_world_gossip_menu_option.sql
diff --git a/sql/updates/world/2012_07_29_10_world_sai.sql b/sql/old/3.3.5a/2012_07_29_10_world_sai.sql
index c5513bf2f25..c5513bf2f25 100644
--- a/sql/updates/world/2012_07_29_10_world_sai.sql
+++ b/sql/old/3.3.5a/2012_07_29_10_world_sai.sql
diff --git a/sql/updates/world/2012_08_01_00_world_sai.sql b/sql/old/3.3.5a/2012_08_01_00_world_sai.sql
index bf214cbfa9c..bf214cbfa9c 100644
--- a/sql/updates/world/2012_08_01_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_08_01_00_world_sai.sql
diff --git a/sql/updates/world/2012_08_01_01_world_creature.sql b/sql/old/3.3.5a/2012_08_01_01_world_creature.sql
index 875a956fbd1..875a956fbd1 100644
--- a/sql/updates/world/2012_08_01_01_world_creature.sql
+++ b/sql/old/3.3.5a/2012_08_01_01_world_creature.sql
diff --git a/sql/updates/world/2012_08_01_02_world_loot.sql b/sql/old/3.3.5a/2012_08_01_02_world_loot.sql
index a27bd274acf..a27bd274acf 100644
--- a/sql/updates/world/2012_08_01_02_world_loot.sql
+++ b/sql/old/3.3.5a/2012_08_01_02_world_loot.sql
diff --git a/sql/updates/world/2012_08_02_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_08_02_00_world_spell_script_names.sql
index f14e44e35ff..f14e44e35ff 100644
--- a/sql/updates/world/2012_08_02_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_08_02_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_08_04_00_world_disables.sql b/sql/old/3.3.5a/2012_08_04_00_world_disables.sql
index f3f197ba23a..f3f197ba23a 100644
--- a/sql/updates/world/2012_08_04_00_world_disables.sql
+++ b/sql/old/3.3.5a/2012_08_04_00_world_disables.sql
diff --git a/sql/updates/world/2012_08_04_01_world_disables.sql b/sql/old/3.3.5a/2012_08_04_01_world_disables.sql
index ca9f62564d5..ca9f62564d5 100644
--- a/sql/updates/world/2012_08_04_01_world_disables.sql
+++ b/sql/old/3.3.5a/2012_08_04_01_world_disables.sql
diff --git a/sql/updates/world/2012_08_04_02_world_disables.sql b/sql/old/3.3.5a/2012_08_04_02_world_disables.sql
index cccc7141d68..cccc7141d68 100644
--- a/sql/updates/world/2012_08_04_02_world_disables.sql
+++ b/sql/old/3.3.5a/2012_08_04_02_world_disables.sql
diff --git a/sql/updates/world/2012_08_04_03_world_disables.sql b/sql/old/3.3.5a/2012_08_04_03_world_disables.sql
index e2d1ca1ff6b..e2d1ca1ff6b 100644
--- a/sql/updates/world/2012_08_04_03_world_disables.sql
+++ b/sql/old/3.3.5a/2012_08_04_03_world_disables.sql
diff --git a/sql/updates/world/2012_08_04_04_world_disables.sql b/sql/old/3.3.5a/2012_08_04_04_world_disables.sql
index 14a0d6f94aa..14a0d6f94aa 100644
--- a/sql/updates/world/2012_08_04_04_world_disables.sql
+++ b/sql/old/3.3.5a/2012_08_04_04_world_disables.sql
diff --git a/sql/updates/world/2012_08_04_05_world_disables.sql b/sql/old/3.3.5a/2012_08_04_05_world_disables.sql
index ce123e4e5be..ce123e4e5be 100644
--- a/sql/updates/world/2012_08_04_05_world_disables.sql
+++ b/sql/old/3.3.5a/2012_08_04_05_world_disables.sql
diff --git a/sql/updates/world/2012_08_04_06_world_quest_template.sql b/sql/old/3.3.5a/2012_08_04_06_world_quest_template.sql
index fe48c887ae0..fe48c887ae0 100644
--- a/sql/updates/world/2012_08_04_06_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_08_04_06_world_quest_template.sql
diff --git a/sql/updates/world/2012_08_04_07_world_game_event_creature_quest.sql b/sql/old/3.3.5a/2012_08_04_07_world_game_event_creature_quest.sql
index b72f8edd46d..b72f8edd46d 100644
--- a/sql/updates/world/2012_08_04_07_world_game_event_creature_quest.sql
+++ b/sql/old/3.3.5a/2012_08_04_07_world_game_event_creature_quest.sql
diff --git a/sql/updates/world/2012_08_04_08_world_disables.sql b/sql/old/3.3.5a/2012_08_04_08_world_disables.sql
index 6944c45f1f4..6944c45f1f4 100644
--- a/sql/updates/world/2012_08_04_08_world_disables.sql
+++ b/sql/old/3.3.5a/2012_08_04_08_world_disables.sql
diff --git a/sql/updates/world/2012_08_04_09_world_disables.sql b/sql/old/3.3.5a/2012_08_04_09_world_disables.sql
index 3023625410e..3023625410e 100644
--- a/sql/updates/world/2012_08_04_09_world_disables.sql
+++ b/sql/old/3.3.5a/2012_08_04_09_world_disables.sql
diff --git a/sql/updates/world/2012_08_04_10_world_disables.sql b/sql/old/3.3.5a/2012_08_04_10_world_disables.sql
index 1d991eafef5..1d991eafef5 100644
--- a/sql/updates/world/2012_08_04_10_world_disables.sql
+++ b/sql/old/3.3.5a/2012_08_04_10_world_disables.sql
diff --git a/sql/updates/world/2012_08_04_11_world_game_event_creature_quest.sql b/sql/old/3.3.5a/2012_08_04_11_world_game_event_creature_quest.sql
index 224749c7e10..224749c7e10 100644
--- a/sql/updates/world/2012_08_04_11_world_game_event_creature_quest.sql
+++ b/sql/old/3.3.5a/2012_08_04_11_world_game_event_creature_quest.sql
diff --git a/sql/updates/world/2012_08_05_00_world_trinity_string.sql b/sql/old/3.3.5a/2012_08_05_00_world_trinity_string.sql
index e432f598c02..e432f598c02 100644
--- a/sql/updates/world/2012_08_05_00_world_trinity_string.sql
+++ b/sql/old/3.3.5a/2012_08_05_00_world_trinity_string.sql
diff --git a/sql/updates/world/2012_08_05_01_world_command.sql b/sql/old/3.3.5a/2012_08_05_01_world_command.sql
index f19bfe1c0d0..f19bfe1c0d0 100644
--- a/sql/updates/world/2012_08_05_01_world_command.sql
+++ b/sql/old/3.3.5a/2012_08_05_01_world_command.sql
diff --git a/sql/updates/auth/2012_08_06_00_auth_logs.sql b/sql/old/3.3.5a/2012_08_06_00_auth_logs.sql
index 04e90e7d208..04e90e7d208 100644
--- a/sql/updates/auth/2012_08_06_00_auth_logs.sql
+++ b/sql/old/3.3.5a/2012_08_06_00_auth_logs.sql
diff --git a/sql/updates/world/2012_08_06_00_world_command.sql b/sql/old/3.3.5a/2012_08_06_00_world_command.sql
index 50628aaa589..50628aaa589 100644
--- a/sql/updates/world/2012_08_06_00_world_command.sql
+++ b/sql/old/3.3.5a/2012_08_06_00_world_command.sql
diff --git a/sql/updates/characters/2012_08_07_00_characters_characters.sql b/sql/old/3.3.5a/2012_08_07_00_characters_characters.sql
index e9bea82ad4b..e9bea82ad4b 100644
--- a/sql/updates/characters/2012_08_07_00_characters_characters.sql
+++ b/sql/old/3.3.5a/2012_08_07_00_characters_characters.sql
diff --git a/sql/updates/world/2012_08_09_00_world_creature_template.sql b/sql/old/3.3.5a/2012_08_09_00_world_creature_template.sql
index 8d04c13dc87..8d04c13dc87 100644
--- a/sql/updates/world/2012_08_09_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_08_09_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_08_09_01_world_sai.sql b/sql/old/3.3.5a/2012_08_09_01_world_sai.sql
index 94dce1bcc2c..94dce1bcc2c 100644
--- a/sql/updates/world/2012_08_09_01_world_sai.sql
+++ b/sql/old/3.3.5a/2012_08_09_01_world_sai.sql
diff --git a/sql/updates/world/2012_08_10_00_world_conditions.sql b/sql/old/3.3.5a/2012_08_10_00_world_conditions.sql
index 14c5c570b6e..14c5c570b6e 100644
--- a/sql/updates/world/2012_08_10_00_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_08_10_00_world_conditions.sql
diff --git a/sql/updates/world/2012_08_10_01_world_loot_template.sql b/sql/old/3.3.5a/2012_08_10_01_world_loot_template.sql
index 07d400dc0d7..07d400dc0d7 100644
--- a/sql/updates/world/2012_08_10_01_world_loot_template.sql
+++ b/sql/old/3.3.5a/2012_08_10_01_world_loot_template.sql
diff --git a/sql/updates/world/2012_08_10_02_world_script_texts.sql b/sql/old/3.3.5a/2012_08_10_02_world_script_texts.sql
index 0b97df592e1..0b97df592e1 100644
--- a/sql/updates/world/2012_08_10_02_world_script_texts.sql
+++ b/sql/old/3.3.5a/2012_08_10_02_world_script_texts.sql
diff --git a/sql/updates/world/2012_08_10_03_world_quest_template.sql b/sql/old/3.3.5a/2012_08_10_03_world_quest_template.sql
index c4aebf5ba16..c4aebf5ba16 100644
--- a/sql/updates/world/2012_08_10_03_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_08_10_03_world_quest_template.sql
diff --git a/sql/updates/world/2012_08_10_04_world_gossip.sql b/sql/old/3.3.5a/2012_08_10_04_world_gossip.sql
index a2082447dfc..a2082447dfc 100644
--- a/sql/updates/world/2012_08_10_04_world_gossip.sql
+++ b/sql/old/3.3.5a/2012_08_10_04_world_gossip.sql
diff --git a/sql/updates/world/2012_08_10_05_world_quest_template.sql b/sql/old/3.3.5a/2012_08_10_05_world_quest_template.sql
index a65e7e76a44..a65e7e76a44 100644
--- a/sql/updates/world/2012_08_10_05_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_08_10_05_world_quest_template.sql
diff --git a/sql/updates/world/2012_08_10_06_world_creature.sql b/sql/old/3.3.5a/2012_08_10_06_world_creature.sql
index 3d59f06db78..3d59f06db78 100644
--- a/sql/updates/world/2012_08_10_06_world_creature.sql
+++ b/sql/old/3.3.5a/2012_08_10_06_world_creature.sql
diff --git a/sql/updates/world/2012_08_11_00_world_creature_template.sql b/sql/old/3.3.5a/2012_08_11_00_world_creature_template.sql
index 972b125d247..972b125d247 100644
--- a/sql/updates/world/2012_08_11_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_08_11_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_08_11_01_world_quest_poi.sql b/sql/old/3.3.5a/2012_08_11_01_world_quest_poi.sql
index 6672df2bc98..6672df2bc98 100644
--- a/sql/updates/world/2012_08_11_01_world_quest_poi.sql
+++ b/sql/old/3.3.5a/2012_08_11_01_world_quest_poi.sql
diff --git a/sql/updates/world/2012_08_12_00_world_conditions.sql b/sql/old/3.3.5a/2012_08_12_00_world_conditions.sql
index 6e1fd0ac1db..6e1fd0ac1db 100644
--- a/sql/updates/world/2012_08_12_00_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_08_12_00_world_conditions.sql
diff --git a/sql/updates/world/2012_08_12_01_world_spell_script_names.sql b/sql/old/3.3.5a/2012_08_12_01_world_spell_script_names.sql
index 980aceff519..980aceff519 100644
--- a/sql/updates/world/2012_08_12_01_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_08_12_01_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_08_12_02_world_spell_script_names.sql b/sql/old/3.3.5a/2012_08_12_02_world_spell_script_names.sql
index 15ca9c43cc5..15ca9c43cc5 100644
--- a/sql/updates/world/2012_08_12_02_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_08_12_02_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_08_13_00_world_creature_text.sql b/sql/old/3.3.5a/2012_08_13_00_world_creature_text.sql
index aeb24dbfe90..aeb24dbfe90 100644
--- a/sql/updates/world/2012_08_13_00_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_08_13_00_world_creature_text.sql
diff --git a/sql/updates/world/2012_08_13_01_world_creature.sql b/sql/old/3.3.5a/2012_08_13_01_world_creature.sql
index 4d8544206dd..4d8544206dd 100644
--- a/sql/updates/world/2012_08_13_01_world_creature.sql
+++ b/sql/old/3.3.5a/2012_08_13_01_world_creature.sql
diff --git a/sql/updates/world/2012_08_14_00_world_creature_text.sql b/sql/old/3.3.5a/2012_08_14_00_world_creature_text.sql
index bd0f3531937..bd0f3531937 100644
--- a/sql/updates/world/2012_08_14_00_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_08_14_00_world_creature_text.sql
diff --git a/sql/updates/world/2012_08_14_01_world_creature_text.sql b/sql/old/3.3.5a/2012_08_14_01_world_creature_text.sql
index 0f182ae098e..0f182ae098e 100644
--- a/sql/updates/world/2012_08_14_01_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_08_14_01_world_creature_text.sql
diff --git a/sql/updates/world/2012_08_14_02_world_creature.sql b/sql/old/3.3.5a/2012_08_14_02_world_creature.sql
index 5096c7d6b49..5096c7d6b49 100644
--- a/sql/updates/world/2012_08_14_02_world_creature.sql
+++ b/sql/old/3.3.5a/2012_08_14_02_world_creature.sql
diff --git a/sql/updates/world/2012_08_16_00_world_creature_template.sql b/sql/old/3.3.5a/2012_08_16_00_world_creature_template.sql
index 732f647d7b7..732f647d7b7 100644
--- a/sql/updates/world/2012_08_16_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_08_16_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_08_16_00_world_spell_dbc.sql b/sql/old/3.3.5a/2012_08_16_00_world_spell_dbc.sql
index 248674d17a5..248674d17a5 100644
--- a/sql/updates/world/2012_08_16_00_world_spell_dbc.sql
+++ b/sql/old/3.3.5a/2012_08_16_00_world_spell_dbc.sql
diff --git a/sql/updates/world/2012_08_17_00_world_spell_dbc.sql b/sql/old/3.3.5a/2012_08_17_00_world_spell_dbc.sql
index ee6d2d2f3b6..ee6d2d2f3b6 100644
--- a/sql/updates/world/2012_08_17_00_world_spell_dbc.sql
+++ b/sql/old/3.3.5a/2012_08_17_00_world_spell_dbc.sql
diff --git a/sql/updates/world/2012_08_19_00_world_pickpocketing_loot_template.sql b/sql/old/3.3.5a/2012_08_19_00_world_pickpocketing_loot_template.sql
index 773ad9b6ebc..773ad9b6ebc 100644
--- a/sql/updates/world/2012_08_19_00_world_pickpocketing_loot_template.sql
+++ b/sql/old/3.3.5a/2012_08_19_00_world_pickpocketing_loot_template.sql
diff --git a/sql/updates/world/2012_08_19_01_world_spell_dbc.sql b/sql/old/3.3.5a/2012_08_19_01_world_spell_dbc.sql
index 69a9c2a8336..69a9c2a8336 100644
--- a/sql/updates/world/2012_08_19_01_world_spell_dbc.sql
+++ b/sql/old/3.3.5a/2012_08_19_01_world_spell_dbc.sql
diff --git a/sql/updates/world/2012_08_20_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_08_20_00_world_spell_script_names.sql
index d0aa185ea3a..d0aa185ea3a 100644
--- a/sql/updates/world/2012_08_20_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_08_20_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_08_20_01_world_wintergrasp_conditions.sql b/sql/old/3.3.5a/2012_08_20_01_world_wintergrasp_conditions.sql
index c97c753afa8..c97c753afa8 100644
--- a/sql/updates/world/2012_08_20_01_world_wintergrasp_conditions.sql
+++ b/sql/old/3.3.5a/2012_08_20_01_world_wintergrasp_conditions.sql
diff --git a/sql/updates/world/2012_08_20_02_world_wintergrasp_creatures.sql b/sql/old/3.3.5a/2012_08_20_02_world_wintergrasp_creatures.sql
index 1e75f37d32f..1e75f37d32f 100644
--- a/sql/updates/world/2012_08_20_02_world_wintergrasp_creatures.sql
+++ b/sql/old/3.3.5a/2012_08_20_02_world_wintergrasp_creatures.sql
diff --git a/sql/updates/world/2012_08_20_03_world_wintergrasp_gameobjects.sql b/sql/old/3.3.5a/2012_08_20_03_world_wintergrasp_gameobjects.sql
index c309bf1d9dd..c309bf1d9dd 100644
--- a/sql/updates/world/2012_08_20_03_world_wintergrasp_gameobjects.sql
+++ b/sql/old/3.3.5a/2012_08_20_03_world_wintergrasp_gameobjects.sql
diff --git a/sql/updates/world/2012_08_20_04_world_wintergrasp_gossips.sql b/sql/old/3.3.5a/2012_08_20_04_world_wintergrasp_gossips.sql
index 87b96b765a6..87b96b765a6 100644
--- a/sql/updates/world/2012_08_20_04_world_wintergrasp_gossips.sql
+++ b/sql/old/3.3.5a/2012_08_20_04_world_wintergrasp_gossips.sql
diff --git a/sql/updates/world/2012_08_20_05_world_wintergrasp_quests.sql b/sql/old/3.3.5a/2012_08_20_05_world_wintergrasp_quests.sql
index d456f5d5e71..d456f5d5e71 100644
--- a/sql/updates/world/2012_08_20_05_world_wintergrasp_quests.sql
+++ b/sql/old/3.3.5a/2012_08_20_05_world_wintergrasp_quests.sql
diff --git a/sql/updates/world/2012_08_20_06_world_wintergrasp_spells.sql b/sql/old/3.3.5a/2012_08_20_06_world_wintergrasp_spells.sql
index cb2bd219e40..cb2bd219e40 100644
--- a/sql/updates/world/2012_08_20_06_world_wintergrasp_spells.sql
+++ b/sql/old/3.3.5a/2012_08_20_06_world_wintergrasp_spells.sql
diff --git a/sql/updates/world/2012_08_20_07_world_wintergrasp_texts.sql b/sql/old/3.3.5a/2012_08_20_07_world_wintergrasp_texts.sql
index 090c5350c74..090c5350c74 100644
--- a/sql/updates/world/2012_08_20_07_world_wintergrasp_texts.sql
+++ b/sql/old/3.3.5a/2012_08_20_07_world_wintergrasp_texts.sql
diff --git a/sql/updates/world/2012_08_20_08_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_08_20_08_world_achievement_criteria_data.sql
index fa995e7804f..fa995e7804f 100644
--- a/sql/updates/world/2012_08_20_08_world_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2012_08_20_08_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2012_08_20_09_world_disables.sql b/sql/old/3.3.5a/2012_08_20_09_world_disables.sql
index fa5010b669f..fa5010b669f 100644
--- a/sql/updates/world/2012_08_20_09_world_disables.sql
+++ b/sql/old/3.3.5a/2012_08_20_09_world_disables.sql
diff --git a/sql/updates/world/2012_08_21_00_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_08_21_00_world_spell_proc_event.sql
index e1a8b59acae..e1a8b59acae 100644
--- a/sql/updates/world/2012_08_21_00_world_spell_proc_event.sql
+++ b/sql/old/3.3.5a/2012_08_21_00_world_spell_proc_event.sql
diff --git a/sql/updates/world/2012_08_21_01_world_command.sql b/sql/old/3.3.5a/2012_08_21_01_world_command.sql
index df833d2d246..df833d2d246 100644
--- a/sql/updates/world/2012_08_21_01_world_command.sql
+++ b/sql/old/3.3.5a/2012_08_21_01_world_command.sql
diff --git a/sql/updates/world/2012_08_21_02_world_wintergrasp_conditions.sql b/sql/old/3.3.5a/2012_08_21_02_world_wintergrasp_conditions.sql
index caf8a0cc1e4..caf8a0cc1e4 100644
--- a/sql/updates/world/2012_08_21_02_world_wintergrasp_conditions.sql
+++ b/sql/old/3.3.5a/2012_08_21_02_world_wintergrasp_conditions.sql
diff --git a/sql/updates/world/2012_08_23_00_world_wintergrasp_spell_script_names.sql b/sql/old/3.3.5a/2012_08_23_00_world_wintergrasp_spell_script_names.sql
index a3dbf81d425..a3dbf81d425 100644
--- a/sql/updates/world/2012_08_23_00_world_wintergrasp_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_08_23_00_world_wintergrasp_spell_script_names.sql
diff --git a/sql/updates/world/2012_08_23_01_world_wintergrasp_gameobject.sql b/sql/old/3.3.5a/2012_08_23_01_world_wintergrasp_gameobject.sql
index 27f7b4027f1..27f7b4027f1 100644
--- a/sql/updates/world/2012_08_23_01_world_wintergrasp_gameobject.sql
+++ b/sql/old/3.3.5a/2012_08_23_01_world_wintergrasp_gameobject.sql
diff --git a/sql/updates/world/2012_08_25_00_world_creature_template.sql b/sql/old/3.3.5a/2012_08_25_00_world_creature_template.sql
index f7ec4c87fb9..f7ec4c87fb9 100644
--- a/sql/updates/world/2012_08_25_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_08_25_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_08_25_01_world_creature_template.sql b/sql/old/3.3.5a/2012_08_25_01_world_creature_template.sql
index ef8e5bdd8fc..ef8e5bdd8fc 100644
--- a/sql/updates/world/2012_08_25_01_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_08_25_01_world_creature_template.sql
diff --git a/sql/updates/world/2012_08_26_00_world_conditions.sql b/sql/old/3.3.5a/2012_08_26_00_world_conditions.sql
index c33d9bfc878..c33d9bfc878 100644
--- a/sql/updates/world/2012_08_26_00_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_08_26_00_world_conditions.sql
diff --git a/sql/updates/world/2012_08_26_01_world_creature.sql b/sql/old/3.3.5a/2012_08_26_01_world_creature.sql
index af14886850d..af14886850d 100644
--- a/sql/updates/world/2012_08_26_01_world_creature.sql
+++ b/sql/old/3.3.5a/2012_08_26_01_world_creature.sql
diff --git a/sql/updates/world/2012_08_26_02_world_spell_area.sql b/sql/old/3.3.5a/2012_08_26_02_world_spell_area.sql
index c4eae68e3c4..c4eae68e3c4 100644
--- a/sql/updates/world/2012_08_26_02_world_spell_area.sql
+++ b/sql/old/3.3.5a/2012_08_26_02_world_spell_area.sql
diff --git a/sql/updates/world/2012_08_26_03_world_spell_area.sql b/sql/old/3.3.5a/2012_08_26_03_world_spell_area.sql
index 65072d2b4a7..65072d2b4a7 100644
--- a/sql/updates/world/2012_08_26_03_world_spell_area.sql
+++ b/sql/old/3.3.5a/2012_08_26_03_world_spell_area.sql
diff --git a/sql/updates/world/2012_08_27_00_world_creature_template.sql b/sql/old/3.3.5a/2012_08_27_00_world_creature_template.sql
index 804d7b5c61d..804d7b5c61d 100644
--- a/sql/updates/world/2012_08_27_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_08_27_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_08_27_00_world_spell_script_name.sql b/sql/old/3.3.5a/2012_08_27_00_world_spell_script_name.sql
index 1d036df0a65..1d036df0a65 100644
--- a/sql/updates/world/2012_08_27_00_world_spell_script_name.sql
+++ b/sql/old/3.3.5a/2012_08_27_00_world_spell_script_name.sql
diff --git a/sql/updates/world/2012_08_27_01_world_sai.sql b/sql/old/3.3.5a/2012_08_27_01_world_sai.sql
index 302c3ac1942..302c3ac1942 100644
--- a/sql/updates/world/2012_08_27_01_world_sai.sql
+++ b/sql/old/3.3.5a/2012_08_27_01_world_sai.sql
diff --git a/sql/updates/world/2012_08_27_02_world_creature.sql b/sql/old/3.3.5a/2012_08_27_02_world_creature.sql
index 3595ea7b576..3595ea7b576 100644
--- a/sql/updates/world/2012_08_27_02_world_creature.sql
+++ b/sql/old/3.3.5a/2012_08_27_02_world_creature.sql
diff --git a/sql/updates/world/2012_08_27_02_world_playercreateinfo_spell.sql b/sql/old/3.3.5a/2012_08_27_02_world_playercreateinfo_spell.sql
index 9c664142bba..9c664142bba 100644
--- a/sql/updates/world/2012_08_27_02_world_playercreateinfo_spell.sql
+++ b/sql/old/3.3.5a/2012_08_27_02_world_playercreateinfo_spell.sql
diff --git a/sql/updates/world/2012_08_27_03_world_gameobject.sql b/sql/old/3.3.5a/2012_08_27_03_world_gameobject.sql
index 1bf836c96e0..1bf836c96e0 100644
--- a/sql/updates/world/2012_08_27_03_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_08_27_03_world_gameobject.sql
diff --git a/sql/updates/world/2012_08_27_04_world_quest_template.sql b/sql/old/3.3.5a/2012_08_27_04_world_quest_template.sql
index 9169a6e5862..9169a6e5862 100644
--- a/sql/updates/world/2012_08_27_04_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_08_27_04_world_quest_template.sql
diff --git a/sql/updates/world/2012_08_27_05_world_sai.sql b/sql/old/3.3.5a/2012_08_27_05_world_sai.sql
index 3da0143e6e6..3da0143e6e6 100644
--- a/sql/updates/world/2012_08_27_05_world_sai.sql
+++ b/sql/old/3.3.5a/2012_08_27_05_world_sai.sql
diff --git a/sql/updates/world/2012_08_27_06_world_sai.sql b/sql/old/3.3.5a/2012_08_27_06_world_sai.sql
index 8b1aafd1558..8b1aafd1558 100644
--- a/sql/updates/world/2012_08_27_06_world_sai.sql
+++ b/sql/old/3.3.5a/2012_08_27_06_world_sai.sql
diff --git a/sql/updates/world/2012_08_27_07_world_spell_area.sql b/sql/old/3.3.5a/2012_08_27_07_world_spell_area.sql
index 18be6ff0dbe..18be6ff0dbe 100644
--- a/sql/updates/world/2012_08_27_07_world_spell_area.sql
+++ b/sql/old/3.3.5a/2012_08_27_07_world_spell_area.sql
diff --git a/sql/updates/world/2012_08_27_08_world_misc.sql b/sql/old/3.3.5a/2012_08_27_08_world_misc.sql
index 62a57cd42de..62a57cd42de 100644
--- a/sql/updates/world/2012_08_27_08_world_misc.sql
+++ b/sql/old/3.3.5a/2012_08_27_08_world_misc.sql
diff --git a/sql/updates/world/2012_08_27_09_world_conditions.sql b/sql/old/3.3.5a/2012_08_27_09_world_conditions.sql
index 6d536859060..6d536859060 100644
--- a/sql/updates/world/2012_08_27_09_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_08_27_09_world_conditions.sql
diff --git a/sql/updates/world/2012_08_27_10_world_spell_script_names.sql b/sql/old/3.3.5a/2012_08_27_10_world_spell_script_names.sql
index 9ffb153f498..9ffb153f498 100644
--- a/sql/updates/world/2012_08_27_10_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_08_27_10_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_08_28_00_world_spell_script_name.sql b/sql/old/3.3.5a/2012_08_28_00_world_spell_script_name.sql
index 01cfeb35f1f..01cfeb35f1f 100644
--- a/sql/updates/world/2012_08_28_00_world_spell_script_name.sql
+++ b/sql/old/3.3.5a/2012_08_28_00_world_spell_script_name.sql
diff --git a/sql/updates/world/2012_08_28_01_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_08_28_01_world_achievement_criteria_data.sql
index bf247399553..bf247399553 100644
--- a/sql/updates/world/2012_08_28_01_world_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2012_08_28_01_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2012_08_29_00_world_blood_furnace.sql b/sql/old/3.3.5a/2012_08_29_00_world_blood_furnace.sql
index 85b493da202..85b493da202 100644
--- a/sql/updates/world/2012_08_29_00_world_blood_furnace.sql
+++ b/sql/old/3.3.5a/2012_08_29_00_world_blood_furnace.sql
diff --git a/sql/updates/world/2012_08_30_00_world_creature_template.sql b/sql/old/3.3.5a/2012_08_30_00_world_creature_template.sql
index 27c1c1dedd4..27c1c1dedd4 100644
--- a/sql/updates/world/2012_08_30_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_08_30_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_08_30_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_08_30_00_world_spell_script_names.sql
index d7602dd8c79..d7602dd8c79 100644
--- a/sql/updates/world/2012_08_30_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_08_30_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_08_31_00_world_command.sql b/sql/old/3.3.5a/2012_08_31_00_world_command.sql
index c0686d6d907..c0686d6d907 100644
--- a/sql/updates/world/2012_08_31_00_world_command.sql
+++ b/sql/old/3.3.5a/2012_08_31_00_world_command.sql
diff --git a/sql/updates/world/2012_08_31_00_world_sai.sql b/sql/old/3.3.5a/2012_08_31_00_world_sai.sql
index fd7e0d7810f..fd7e0d7810f 100644
--- a/sql/updates/world/2012_08_31_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_08_31_00_world_sai.sql
diff --git a/sql/updates/world/2012_09_01_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_09_01_00_world_spell_script_names.sql
index add7621b74c..add7621b74c 100644
--- a/sql/updates/world/2012_09_01_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_09_01_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_09_02_00_world_quest_template.sql b/sql/old/3.3.5a/2012_09_02_00_world_quest_template.sql
index d7e3948ef4f..d7e3948ef4f 100644
--- a/sql/updates/world/2012_09_02_00_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_09_02_00_world_quest_template.sql
diff --git a/sql/updates/world/2012_09_02_01_world_sai.sql b/sql/old/3.3.5a/2012_09_02_01_world_sai.sql
index 971c50d9c05..971c50d9c05 100644
--- a/sql/updates/world/2012_09_02_01_world_sai.sql
+++ b/sql/old/3.3.5a/2012_09_02_01_world_sai.sql
diff --git a/sql/updates/world/2012_09_03_00_world_misc.sql b/sql/old/3.3.5a/2012_09_03_00_world_misc.sql
index e8910c78b40..e8910c78b40 100644
--- a/sql/updates/world/2012_09_03_00_world_misc.sql
+++ b/sql/old/3.3.5a/2012_09_03_00_world_misc.sql
diff --git a/sql/updates/world/2012_09_03_01_world_gameobject_template.sql b/sql/old/3.3.5a/2012_09_03_01_world_gameobject_template.sql
index ff0907eee6e..ff0907eee6e 100644
--- a/sql/updates/world/2012_09_03_01_world_gameobject_template.sql
+++ b/sql/old/3.3.5a/2012_09_03_01_world_gameobject_template.sql
diff --git a/sql/updates/world/2012_09_03_02_world_quest_template.sql b/sql/old/3.3.5a/2012_09_03_02_world_quest_template.sql
index 0c0a7ce4e40..0c0a7ce4e40 100644
--- a/sql/updates/world/2012_09_03_02_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_09_03_02_world_quest_template.sql
diff --git a/sql/updates/characters/2012_09_07_00_characters_characters.sql b/sql/old/3.3.5a/2012_09_07_00_characters_characters.sql
index 26ad904b4a0..26ad904b4a0 100644
--- a/sql/updates/characters/2012_09_07_00_characters_characters.sql
+++ b/sql/old/3.3.5a/2012_09_07_00_characters_characters.sql
diff --git a/sql/updates/world/2012_09_07_00_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_09_07_00_world_spell_bonus_data.sql
index 3d39c06051a..3d39c06051a 100644
--- a/sql/updates/world/2012_09_07_00_world_spell_bonus_data.sql
+++ b/sql/old/3.3.5a/2012_09_07_00_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2012_09_07_01_world_creature_template.sql b/sql/old/3.3.5a/2012_09_07_01_world_creature_template.sql
index 16e4f670fd2..16e4f670fd2 100644
--- a/sql/updates/world/2012_09_07_01_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_09_07_01_world_creature_template.sql
diff --git a/sql/updates/world/2012_09_07_02_world_spell_script_names.sql b/sql/old/3.3.5a/2012_09_07_02_world_spell_script_names.sql
index 652d45543e3..652d45543e3 100644
--- a/sql/updates/world/2012_09_07_02_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_09_07_02_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_09_08_00_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_09_08_00_world_achievement_criteria_data.sql
index cce5745dee9..cce5745dee9 100644
--- a/sql/updates/world/2012_09_08_00_world_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2012_09_08_00_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2012_09_08_01_world_creature_template.sql b/sql/old/3.3.5a/2012_09_08_01_world_creature_template.sql
index fb34f345f2d..fb34f345f2d 100644
--- a/sql/updates/world/2012_09_08_01_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_09_08_01_world_creature_template.sql
diff --git a/sql/updates/world/2012_09_08_02_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_09_08_02_world_achievement_criteria_data.sql
index 2f25f6f20fa..2f25f6f20fa 100644
--- a/sql/updates/world/2012_09_08_02_world_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2012_09_08_02_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2012_09_09_00_world_command.sql b/sql/old/3.3.5a/2012_09_09_00_world_command.sql
index 1fb3247bfbb..1fb3247bfbb 100644
--- a/sql/updates/world/2012_09_09_00_world_command.sql
+++ b/sql/old/3.3.5a/2012_09_09_00_world_command.sql
diff --git a/sql/updates/world/2012_09_09_01_world_trinity_string.sql b/sql/old/3.3.5a/2012_09_09_01_world_trinity_string.sql
index 2f3c0aa1938..2f3c0aa1938 100644
--- a/sql/updates/world/2012_09_09_01_world_trinity_string.sql
+++ b/sql/old/3.3.5a/2012_09_09_01_world_trinity_string.sql
diff --git a/sql/updates/world/2012_09_09_02_world_spell_script_names.sql b/sql/old/3.3.5a/2012_09_09_02_world_spell_script_names.sql
index 36e5b08c36d..36e5b08c36d 100644
--- a/sql/updates/world/2012_09_09_02_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_09_09_02_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_09_09_03_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_09_09_03_world_spell_bonus_data.sql
index a08c494da1b..a08c494da1b 100644
--- a/sql/updates/world/2012_09_09_03_world_spell_bonus_data.sql
+++ b/sql/old/3.3.5a/2012_09_09_03_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2012_09_09_04_world_quest_template.sql b/sql/old/3.3.5a/2012_09_09_04_world_quest_template.sql
index 418c5badb36..418c5badb36 100644
--- a/sql/updates/world/2012_09_09_04_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_09_09_04_world_quest_template.sql
diff --git a/sql/updates/world/2012_09_10_00_world_game_event.sql b/sql/old/3.3.5a/2012_09_10_00_world_game_event.sql
index edd6413379c..edd6413379c 100644
--- a/sql/updates/world/2012_09_10_00_world_game_event.sql
+++ b/sql/old/3.3.5a/2012_09_10_00_world_game_event.sql
diff --git a/sql/updates/world/2012_09_10_01_world_quest_template.sql b/sql/old/3.3.5a/2012_09_10_01_world_quest_template.sql
index 2db8883d92c..2db8883d92c 100644
--- a/sql/updates/world/2012_09_10_01_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_09_10_01_world_quest_template.sql
diff --git a/sql/updates/world/2012_09_10_02_world_creature_text.sql b/sql/old/3.3.5a/2012_09_10_02_world_creature_text.sql
index 7a3b1a2d86f..7a3b1a2d86f 100644
--- a/sql/updates/world/2012_09_10_02_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_09_10_02_world_creature_text.sql
diff --git a/sql/updates/world/2012_09_10_03_world_quest_template.sql b/sql/old/3.3.5a/2012_09_10_03_world_quest_template.sql
index aae769ced71..aae769ced71 100644
--- a/sql/updates/world/2012_09_10_03_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_09_10_03_world_quest_template.sql
diff --git a/sql/updates/world/2012_09_10_04_world_quest_template.sql b/sql/old/3.3.5a/2012_09_10_04_world_quest_template.sql
index 5805debd094..5805debd094 100644
--- a/sql/updates/world/2012_09_10_04_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_09_10_04_world_quest_template.sql
diff --git a/sql/updates/world/2012_09_10_06_world_creature_template.sql b/sql/old/3.3.5a/2012_09_10_06_world_creature_template.sql
index 24a60b107ec..24a60b107ec 100644
--- a/sql/updates/world/2012_09_10_06_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_09_10_06_world_creature_template.sql
diff --git a/sql/updates/world/2012_09_10_07_world_go_loot_template.sql b/sql/old/3.3.5a/2012_09_10_07_world_go_loot_template.sql
index a5e30edfe2c..a5e30edfe2c 100644
--- a/sql/updates/world/2012_09_10_07_world_go_loot_template.sql
+++ b/sql/old/3.3.5a/2012_09_10_07_world_go_loot_template.sql
diff --git a/sql/updates/world/2012_09_10_08_world_spell_area.sql b/sql/old/3.3.5a/2012_09_10_08_world_spell_area.sql
index 4e4e36051c9..4e4e36051c9 100644
--- a/sql/updates/world/2012_09_10_08_world_spell_area.sql
+++ b/sql/old/3.3.5a/2012_09_10_08_world_spell_area.sql
diff --git a/sql/updates/world/2012_09_10_09_world_creature_involvedrelation.sql b/sql/old/3.3.5a/2012_09_10_09_world_creature_involvedrelation.sql
index e30e1559c54..e30e1559c54 100644
--- a/sql/updates/world/2012_09_10_09_world_creature_involvedrelation.sql
+++ b/sql/old/3.3.5a/2012_09_10_09_world_creature_involvedrelation.sql
diff --git a/sql/updates/world/2012_09_10_10_world_gossips.sql b/sql/old/3.3.5a/2012_09_10_10_world_gossips.sql
index 042b05dc83a..042b05dc83a 100644
--- a/sql/updates/world/2012_09_10_10_world_gossips.sql
+++ b/sql/old/3.3.5a/2012_09_10_10_world_gossips.sql
diff --git a/sql/updates/world/2012_09_10_11_world_event_scripts.sql b/sql/old/3.3.5a/2012_09_10_11_world_event_scripts.sql
index e0b122ede05..e0b122ede05 100644
--- a/sql/updates/world/2012_09_10_11_world_event_scripts.sql
+++ b/sql/old/3.3.5a/2012_09_10_11_world_event_scripts.sql
diff --git a/sql/updates/world/2012_09_10_12_world_sai.sql b/sql/old/3.3.5a/2012_09_10_12_world_sai.sql
index 99111fb5961..99111fb5961 100644
--- a/sql/updates/world/2012_09_10_12_world_sai.sql
+++ b/sql/old/3.3.5a/2012_09_10_12_world_sai.sql
diff --git a/sql/updates/world/2012_09_10_13_world_creature_model_info.sql b/sql/old/3.3.5a/2012_09_10_13_world_creature_model_info.sql
index 339072d0502..339072d0502 100644
--- a/sql/updates/world/2012_09_10_13_world_creature_model_info.sql
+++ b/sql/old/3.3.5a/2012_09_10_13_world_creature_model_info.sql
diff --git a/sql/updates/world/2012_09_11_00_world_misc.sql b/sql/old/3.3.5a/2012_09_11_00_world_misc.sql
index 0f47f1bf2e9..0f47f1bf2e9 100644
--- a/sql/updates/world/2012_09_11_00_world_misc.sql
+++ b/sql/old/3.3.5a/2012_09_11_00_world_misc.sql
diff --git a/sql/updates/world/2012_09_12_00_world_misc.sql b/sql/old/3.3.5a/2012_09_12_00_world_misc.sql
index 50896ce414c..50896ce414c 100644
--- a/sql/updates/world/2012_09_12_00_world_misc.sql
+++ b/sql/old/3.3.5a/2012_09_12_00_world_misc.sql
diff --git a/sql/updates/world/2012_09_12_01_world_creature.sql b/sql/old/3.3.5a/2012_09_12_01_world_creature.sql
index 1b7fa2d78ef..1b7fa2d78ef 100644
--- a/sql/updates/world/2012_09_12_01_world_creature.sql
+++ b/sql/old/3.3.5a/2012_09_12_01_world_creature.sql
diff --git a/sql/updates/world/2012_09_13_00_world_item_template.sql b/sql/old/3.3.5a/2012_09_13_00_world_item_template.sql
index 48b9d3a107f..48b9d3a107f 100644
--- a/sql/updates/world/2012_09_13_00_world_item_template.sql
+++ b/sql/old/3.3.5a/2012_09_13_00_world_item_template.sql
diff --git a/sql/updates/world/2012_09_13_01_world_fires_over_skettis.sql b/sql/old/3.3.5a/2012_09_13_01_world_fires_over_skettis.sql
index de9ba5a78fe..de9ba5a78fe 100644
--- a/sql/updates/world/2012_09_13_01_world_fires_over_skettis.sql
+++ b/sql/old/3.3.5a/2012_09_13_01_world_fires_over_skettis.sql
diff --git a/sql/updates/world/2012_09_13_01_world_ogrila.sql b/sql/old/3.3.5a/2012_09_13_01_world_ogrila.sql
index 4ccb02e02e5..4ccb02e02e5 100644
--- a/sql/updates/world/2012_09_13_01_world_ogrila.sql
+++ b/sql/old/3.3.5a/2012_09_13_01_world_ogrila.sql
diff --git a/sql/updates/world/2012_09_13_01_world_spell_script_name.sql b/sql/old/3.3.5a/2012_09_13_01_world_spell_script_name.sql
index 61e4067c544..61e4067c544 100644
--- a/sql/updates/world/2012_09_13_01_world_spell_script_name.sql
+++ b/sql/old/3.3.5a/2012_09_13_01_world_spell_script_name.sql
diff --git a/sql/updates/world/2012_09_13_01_world_spell_target_position.sql b/sql/old/3.3.5a/2012_09_13_01_world_spell_target_position.sql
index 0879dbbbda0..0879dbbbda0 100644
--- a/sql/updates/world/2012_09_13_01_world_spell_target_position.sql
+++ b/sql/old/3.3.5a/2012_09_13_01_world_spell_target_position.sql
diff --git a/sql/updates/world/2012_09_13_02_world_trinity_string.sql b/sql/old/3.3.5a/2012_09_13_02_world_trinity_string.sql
index f7214ad127b..f7214ad127b 100644
--- a/sql/updates/world/2012_09_13_02_world_trinity_string.sql
+++ b/sql/old/3.3.5a/2012_09_13_02_world_trinity_string.sql
diff --git a/sql/updates/world/2012_09_14_00_world_creature_template.sql b/sql/old/3.3.5a/2012_09_14_00_world_creature_template.sql
index 335b92e9af7..335b92e9af7 100644
--- a/sql/updates/world/2012_09_14_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_09_14_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_09_14_00_world_sai.sql b/sql/old/3.3.5a/2012_09_14_00_world_sai.sql
index 13f11b7a795..13f11b7a795 100644
--- a/sql/updates/world/2012_09_14_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_09_14_00_world_sai.sql
diff --git a/sql/updates/world/2012_09_14_01_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_09_14_01_world_creature_loot_template.sql
index 77ab9e89b04..77ab9e89b04 100644
--- a/sql/updates/world/2012_09_14_01_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_09_14_01_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_09_15_00_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_09_15_00_world_achievement_criteria_data.sql
index a30eff7024e..a30eff7024e 100644
--- a/sql/updates/world/2012_09_15_00_world_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2012_09_15_00_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2012_09_15_00_world_creature_template.sql b/sql/old/3.3.5a/2012_09_15_00_world_creature_template.sql
index 3db5a598c1d..3db5a598c1d 100644
--- a/sql/updates/world/2012_09_15_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_09_15_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_09_15_00_world_disables.sql b/sql/old/3.3.5a/2012_09_15_00_world_disables.sql
index 371315b5be7..371315b5be7 100644
--- a/sql/updates/world/2012_09_15_00_world_disables.sql
+++ b/sql/old/3.3.5a/2012_09_15_00_world_disables.sql
diff --git a/sql/updates/world/2012_09_15_01_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_09_15_01_world_creature_loot_template.sql
index 71068d95bde..71068d95bde 100644
--- a/sql/updates/world/2012_09_15_01_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_09_15_01_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_09_16_00_world_version.sql b/sql/updates/world/2012_09_16_00_world_version.sql
new file mode 100644
index 00000000000..74a1cf67499
--- /dev/null
+++ b/sql/updates/world/2012_09_16_00_world_version.sql
@@ -0,0 +1 @@
+UPDATE `version` SET `db_version`='TDB 335.49', `cache_id`=49 LIMIT 1;
diff --git a/sql/updates/world/2012_09_16_01_world_conditions.sql b/sql/updates/world/2012_09_16_01_world_conditions.sql
new file mode 100644
index 00000000000..64f87262d0e
--- /dev/null
+++ b/sql/updates/world/2012_09_16_01_world_conditions.sql
@@ -0,0 +1,4 @@
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=10 AND `SourceGroup`=34379;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(10,34379,50452,0,0,19,0,8,0,0,0,0,'', 'Wodin''s Lucky Necklace only 25 heroic'),
+(10,34379,50453,0,0,19,0,8,0,0,0,0,'', 'Ring of Rotting Sinew only 25 heroic');
diff --git a/sql/updates/world/2012_09_16_01_world_creature_loot_template.sql b/sql/updates/world/2012_09_16_01_world_creature_loot_template.sql
new file mode 100644
index 00000000000..2d87ad3aa16
--- /dev/null
+++ b/sql/updates/world/2012_09_16_01_world_creature_loot_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_loot_template` SET `item`=39657 WHERE `entry`=28546 AND `item`=36657;
diff --git a/sql/updates/world/2012_09_16_01_world_creature_template_addon.sql b/sql/updates/world/2012_09_16_01_world_creature_template_addon.sql
new file mode 100644
index 00000000000..15415e856f3
--- /dev/null
+++ b/sql/updates/world/2012_09_16_01_world_creature_template_addon.sql
@@ -0,0 +1,3 @@
+DELETE FROM `creature_template_addon` WHERE `entry`=28670; -- Frostbrood Vanquisher
+INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES 
+(28670,0,0,0x3000000,0x1,0,'53112');
diff --git a/sql/updates/world/2012_09_16_02_world_fires_over_skettis.sql b/sql/updates/world/2012_09_16_02_world_fires_over_skettis.sql
new file mode 100644
index 00000000000..d50f45bb020
--- /dev/null
+++ b/sql/updates/world/2012_09_16_02_world_fires_over_skettis.sql
@@ -0,0 +1,26 @@
+-- Add support for quest ID: 11008 - "Fires Over Skettis" Warpten fix and Nelegalno/shlomi1515 updates
+-- Also add support for achievement - http://www.wowhead.com/achievement=1275/bombs-away
+-- Fix previous SQL what is not changed is not included
+SET @TRIGGER := 22991;
+SET @EGG := 185549;
+SET @SKYBLAST := 39844;
+SET @SUMMEGG := 39843;
+-- Adds SAI support for Monstrous Kaliri Egg Trigger and the GO
+UPDATE `creature_template` SET `AIName`= 'SmartAI' WHERE `entry`=@TRIGGER;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@TRIGGER AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@TRIGGER*100 AND `source_type`=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
+(@TRIGGER,0,0,0,25,0,100,0,0,0,0,0,11,@SUMMEGG,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Monstrous Kaliri Egg Trigger - On spawn/reset - Summon Monstrous Kaliri Egg (object wild)'),
+(@TRIGGER,0,1,2,8,0,100,0,@SKYBLAST,0,0,0,33,@TRIGGER,0,0,0,0,0,16,0,0,0,0,0,0,0, 'Monstrous Kaliri Egg Trigger - On Skyguard Blasting Charge hit - Give kill credit to invoker party'),
+(@TRIGGER,0,2,0,61,0,100,0,0,0,0,0,80,@TRIGGER*100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Monstrous Kaliri Egg Trigger - Linked with previous event - Start script 0'),
+(@TRIGGER*100,9,0,0,0,0,100,0,44000,44000,0,0,11,@SUMMEGG,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Monstrous Kaliri Egg Trigger /On actionlist/ - Action 0 - Cast Summon Monstrous Kaliri Egg');
+-- Add conditions (thanks to Vincent-Michael for adding and Shauren for noticing my failure miss)
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=@SKYBLAST;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,@SKYBLAST,0,0,31,0,3,22991,0,0,0,'','Skyguard Blasting Charge can hit only Monstrous Kaliri Egg Trigger'),
+(13,2,@SKYBLAST,0,0,31,0,5,185549,0,0,0,'','Skyguard Blasting can hit only Monstrous Kaliri Egg');
+-- Remove SAI for Cannonball Stack
+UPDATE `gameobject_template` SET `AIName`='' WHERE `entry`=@EGG;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@EGG AND `source_type`=1;
+-- Delete GO spawns that are not needed
+DELETE FROM `gameobject` WHERE `id`=@EGG;
diff --git a/sql/updates/world/2012_09_16_03_world_spell_script_names.sql b/sql/updates/world/2012_09_16_03_world_spell_script_names.sql
new file mode 100644
index 00000000000..8b7e6aa92ba
--- /dev/null
+++ b/sql/updates/world/2012_09_16_03_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM spell_script_names WHERE scriptName="spell_dru_savage_roar";
+INSERT INTO spell_script_names (spell_id, ScriptName) VALUES
+(52610, 'spell_dru_savage_roar');
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index 7628906f0fc..ddf450d2d56 100755
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -279,16 +279,9 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo)
                 condMeets = player->HasTitle(ConditionValue1);
             break;
         }
-        case CONDITION_MAP_DIFFICULTY:
+        case CONDITION_SPAWNMASK:
         {
-            if (Unit* unit = object->ToUnit())
-            {
-                if (unit->GetMap()->IsRaid())
-                    if (unit->GetMap()->Is25ManRaid() != ((ConditionValue1 & RAID_DIFFICULTY_MASK_25MAN) != 0))
-                        return false;
-
-                condMeets = unit->GetMap()->GetSpawnMode() >= ConditionValue1;
-            }
+            condMeets = ((1 << object->GetMap()->GetSpawnMode()) & ConditionValue1);
             break;
         }
         default:
@@ -442,7 +435,7 @@ uint32 Condition::GetSearcherTypeMaskForCondition()
         case CONDITION_TITLE:
             mask |= GRID_MAP_TYPE_MASK_PLAYER;
             break;
-        case CONDITION_MAP_DIFFICULTY:
+        case CONDITION_SPAWNMASK:
             mask |= GRID_MAP_TYPE_MASK_ALL;
             break;
         default:
@@ -1857,11 +1850,11 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
             }
             break;
         }
-        case CONDITION_MAP_DIFFICULTY:
+        case CONDITION_SPAWNMASK:
         {
-            if (cond->ConditionValue1 >= MAX_DIFFICULTY)
+            if (cond->ConditionValue1 > SPAWNMASK_RAID_ALL)
             {
-                sLog->outError(LOG_FILTER_SQL, "Map Difficulty condition has non existing map difficulty in value1 (%u), skipped", cond->ConditionValue1);
+                sLog->outError(LOG_FILTER_SQL, "SpawnMask condition has non existing SpawnMask in value1 (%u), skipped", cond->ConditionValue1);
                 return false;
             }
             break;
diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h
index 3b0e6cc69f3..bd72015d76f 100755
--- a/src/server/game/Conditions/ConditionMgr.h
+++ b/src/server/game/Conditions/ConditionMgr.h
@@ -49,7 +49,7 @@ enum ConditionTypes
     CONDITION_RACE                  = 16,                   // race             0              0                  true if player's race is equal to race
     CONDITION_ACHIEVEMENT           = 17,                   // achievement_id   0              0                  true if achievement is complete
     CONDITION_TITLE                 = 18,                   // title id         0              0                  true if player has title
-    CONDITION_MAP_DIFFICULTY        = 19,                   // difficulty       0              0
+    CONDITION_SPAWNMASK             = 19,                   // spawnMask        0              0                  true if in spawnMask
     CONDITION_UNUSED_20             = 20,                   //
     CONDITION_UNUSED_21             = 21,                   //
     CONDITION_MAPID                 = 22,                   // map_id           0              0                  true if in map_id
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 06919a43a4d..39e4c7bbe53 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -267,7 +267,6 @@ Unit::Unit(bool isWorldObject): WorldObject(isWorldObject)
     m_serverSideVisibility.SetValue(SERVERSIDE_VISIBILITY_GHOST, GHOST_VISIBILITY_ALIVE);
 
     _focusSpell = NULL;
-    _targetLocked = false;
     _lastLiquid = NULL;
     _isWalkingBeforeCharm = false;
 }
@@ -423,6 +422,9 @@ void Unit::UpdateSplineMovement(uint32 t_diff)
                 transport->CalculatePassengerPosition(loc.x, loc.y, loc.z, loc.orientation);
         }
 
+        if (HasUnitState(UNIT_STATE_CANNOT_TURN))
+            loc.orientation = GetOrientation();
+
         UpdatePosition(loc.x, loc.y, loc.z, loc.orientation);
     }
 }
@@ -17731,3 +17733,31 @@ void Unit::SendMovementCanFlyChange()
     BuildMovementPacket(&data);
     SendMessageToSet(&data, false);
 }
+
+void Unit::FocusTarget(Spell const* focusSpell, uint64 target)
+{
+    // already focused
+    if (_focusSpell)
+        return;
+
+    _focusSpell = focusSpell;
+    SetUInt64Value(UNIT_FIELD_TARGET, target);
+    if (focusSpell->GetSpellInfo()->AttributesEx5 & SPELL_ATTR5_DONT_TURN_DURING_CAST)
+        AddUnitState(UNIT_STATE_ROTATING);
+}
+
+void Unit::ReleaseFocus(Spell const* focusSpell)
+{
+    // focused to something else
+    if (focusSpell != _focusSpell)
+        return;
+
+    _focusSpell = NULL;
+    if (Unit* victim = getVictim())
+        SetUInt64Value(UNIT_FIELD_TARGET, victim->GetGUID());
+    else
+        SetUInt64Value(UNIT_FIELD_TARGET, 0);
+
+    if (focusSpell->GetSpellInfo()->AttributesEx5 & SPELL_ATTR5_DONT_TURN_DURING_CAST)
+        ClearUnitState(UNIT_STATE_ROTATING);
+}
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index 88a8fe0865b..4971685fe1c 100755
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -2208,34 +2208,13 @@ class Unit : public WorldObject
 
         void SetTarget(uint64 guid)
         {
-            if (!_targetLocked)
+            if (!_focusSpell)
                 SetUInt64Value(UNIT_FIELD_TARGET, guid);
         }
 
-        void FocusTarget(Spell const* focusSpell, uint64 target)
-        {
-            // already focused
-            if (_focusSpell)
-                return;
-
-            _focusSpell = focusSpell;
-            _targetLocked = true;
-            SetUInt64Value(UNIT_FIELD_TARGET, target);
-        }
-
-        void ReleaseFocus(Spell const* focusSpell)
-        {
-            // focused to something else
-            if (focusSpell != _focusSpell)
-                return;
-
-            _focusSpell = NULL;
-            _targetLocked = false;
-            if (Unit* victim = getVictim())
-                SetUInt64Value(UNIT_FIELD_TARGET, victim->GetGUID());
-            else
-                SetUInt64Value(UNIT_FIELD_TARGET, 0);
-        }
+        // Handling caster facing during spellcast
+        void FocusTarget(Spell const* focusSpell, uint64 target);
+        void ReleaseFocus(Spell const* focusSpell);
 
         // Movement info
         Movement::MoveSpline * movespline;
@@ -2359,8 +2338,7 @@ class Unit : public WorldObject
         bool m_cleanupDone; // lock made to not add stuff after cleanup before delete
         bool m_duringRemoveFromWorld; // lock made to not add stuff after begining removing from world
 
-        Spell const* _focusSpell;
-        bool _targetLocked; // locks the target during spell cast for proper facing
+        Spell const* _focusSpell;   ///> Locks the target during spell cast for proper facing
         bool _isWalkingBeforeCharm; // Are we walking before we were charmed?
 };
 
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index cffd3faeb8d..39cc06cec14 100755
--- a/src/server/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
@@ -466,7 +466,7 @@ enum SpellAttr5
     SPELL_ATTR5_SPECIAL_ITEM_CLASS_CHECK         = 0x00010000, // 16 this allows spells with EquippedItemClass to affect spells from other items if the required item is equipped
     SPELL_ATTR5_USABLE_WHILE_FEARED              = 0x00020000, // 17 usable while feared
     SPELL_ATTR5_USABLE_WHILE_CONFUSED            = 0x00040000, // 18 usable while confused
-    SPELL_ATTR5_UNK19                            = 0x00080000, // 19
+    SPELL_ATTR5_DONT_TURN_DURING_CAST            = 0x00080000, // 19 Blocks caster's turning when casting (client does not automatically turn caster's model to face UNIT_FIELD_TARGET)
     SPELL_ATTR5_UNK20                            = 0x00100000, // 20
     SPELL_ATTR5_UNK21                            = 0x00200000, // 21
     SPELL_ATTR5_UNK22                            = 0x00400000, // 22
diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
index 145251ec4aa..c275c33032f 100755
--- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
@@ -79,6 +79,7 @@ void TargetedMovementGeneratorMedium<T,D>::_setTargetLocation(T* owner)
 
     Movement::MoveSplineInit init(owner);
     init.MovebyPath(i_path->GetPath());
+    init.SetFacing(i_target.getTarget());
     init.SetWalk(((D*)this)->EnableWalking());
     init.Launch();
 }
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index bffca8f5cee..121e702bfa7 100755
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -3070,10 +3070,9 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect const* triggered
         SendSpellStart();
 
         // set target for proper facing
-        if (m_casttime && !(_triggeredCastFlags & TRIGGERED_IGNORE_SET_FACING))
-            if (uint64 target = m_targets.GetUnitTargetGUID())
-                if (m_caster->GetGUID() != target && m_caster->GetTypeId() == TYPEID_UNIT)
-                    m_caster->FocusTarget(this, target);
+        if ((m_casttime || m_spellInfo->IsChanneled()) && !(_triggeredCastFlags & TRIGGERED_IGNORE_SET_FACING))
+            if (m_caster->GetGUID() != m_targets.GetObjectTargetGUID() && m_caster->GetTypeId() == TYPEID_UNIT)
+                    m_caster->FocusTarget(this, m_targets.GetObjectTargetGUID());
 
         if (!(_triggeredCastFlags & TRIGGERED_IGNORE_GCD))
             TriggerGlobalCooldown();
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
index 4792a9c4e58..0476b2cbacb 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
@@ -120,11 +120,8 @@ class npc_announcer_toc10 : public CreatureScript
         {
             npc_announcer_toc10AI(Creature* creature) : ScriptedAI(creature)
             {
-                instance = creature->GetInstanceScript();
             }
 
-            InstanceScript* instance;
-
             void Reset()
             {
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -274,7 +271,7 @@ class boss_lich_king_toc : public CreatureScript
 
             void MovementInform(uint32 uiType, uint32 uiId)
             {
-                if (uiType != POINT_MOTION_TYPE)
+                if (uiType != POINT_MOTION_TYPE || !instance)
                     return;
                 switch (uiId)
                 {
@@ -338,20 +335,18 @@ class boss_lich_king_toc : public CreatureScript
                             if (GameObject* go = instance->instance->GetGameObject(instance->GetData64(GO_ARGENT_COLISEUM_FLOOR)))
                                 go->SetDestructibleState(GO_DESTRUCTIBLE_DAMAGED);
                             me->CastSpell(me, 69016, false);
-                            if (instance)
-                            {
-                                instance->SetData(TYPE_LICH_KING, DONE);
-                                Creature* temp = Unit::GetCreature(*me, instance->GetData64(NPC_ANUBARAK));
-                                if (!temp || !temp->isAlive())
-                                    temp = me->SummonCreature(NPC_ANUBARAK, AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 3, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME);
+                            instance->SetData(TYPE_LICH_KING, DONE);
+                            Creature* temp = Unit::GetCreature(*me, instance->GetData64(NPC_ANUBARAK));
+                            if (!temp || !temp->isAlive())
+                                temp = me->SummonCreature(NPC_ANUBARAK, AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 3, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME);
 
-                                instance->SetData(TYPE_EVENT, 0);
-                            }
+                            instance->SetData(TYPE_EVENT, 0);
                             me->DespawnOrUnsummon();
                             m_uiUpdateTimer = 20000;
                             break;
                     }
                 } else m_uiUpdateTimer -= uiDiff;
+
                 instance->SetData(TYPE_EVENT_TIMER, m_uiUpdateTimer);
             }
         };
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
index f53020a72c4..b987b00fa5b 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
@@ -125,7 +125,8 @@ public:
 
         void Reset()
         {
-            instance->SetData(DATA_PRINCEKELESETH_EVENT, NOT_STARTED);
+            if (instance)
+                instance->SetData(DATA_PRINCEKELESETH_EVENT, NOT_STARTED);
 
             events.Reset();
             events.ScheduleEvent(EVENT_SHADOWBOLT, urand(2,3)*IN_MILLISECONDS);
@@ -140,13 +141,15 @@ public:
         void EnterCombat(Unit* /*who*/)
         {
             me->SetInCombatWithZone();
-            instance->SetData(DATA_PRINCEKELESETH_EVENT, IN_PROGRESS);
+            if (instance)
+                instance->SetData(DATA_PRINCEKELESETH_EVENT, IN_PROGRESS);
             Talk(SAY_START_COMBAT);
         }
 
         void JustDied(Unit* /*killer*/)
         {
-            instance->SetData(DATA_PRINCEKELESETH_EVENT, DONE);
+            if (instance)
+                instance->SetData(DATA_PRINCEKELESETH_EVENT, DONE);
             summons.DespawnAll();
             Talk(SAY_DEATH);
         }