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 similarity index 100% rename from sql/updates/characters/2012_06_13_00_characters_character_equipmentsets.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_12_00_world_version.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_13_00_world_spell_proc_event.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_13_00_world_spell_script_names.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_14_00_world_creature_loot_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_14_01_world_creature_loot_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_16_00_world_creature_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_16_01_world_reference_loot_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_22_00_world_spelldifficulty_dbc.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_22_01_world_conditions.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_22_02_world_creature_loot_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_22_03_world_gossip.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_22_04_world_gossip.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_22_05_world_script_texts.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_22_06_world_gossip.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_22_07_world_sai.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_22_08_world_sai.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_22_09_world_creature_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_22_10_world_creature_onkill_rep.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_22_11_world_conditions.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_22_12_world_creature_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_22_13_world_conditions.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_22_14_world_gameobject.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_22_15_world_sai.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_29_00_world_factionchange.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_29_01_world_pool_quest.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_29_02_world_sai.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_29_03_world_sai.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_29_04_world_sai.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_29_05_world_sai.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_29_06_world_sai.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_29_07_world_sai.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_29_08_world_sai.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_29_09_world_gossip_menu_option.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_07_29_10_world_sai.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_01_00_world_sai.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_01_01_world_creature.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_01_02_world_loot.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_02_00_world_spell_script_names.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_04_00_world_disables.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_04_01_world_disables.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_04_02_world_disables.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_04_03_world_disables.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_04_04_world_disables.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_04_05_world_disables.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_04_06_world_quest_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_04_07_world_game_event_creature_quest.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_04_08_world_disables.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_04_09_world_disables.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_04_10_world_disables.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_04_11_world_game_event_creature_quest.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_05_00_world_trinity_string.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_05_01_world_command.sql rename to 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 similarity index 100% rename from sql/updates/auth/2012_08_06_00_auth_logs.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_06_00_world_command.sql rename to 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 similarity index 100% rename from sql/updates/characters/2012_08_07_00_characters_characters.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_09_00_world_creature_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_09_01_world_sai.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_10_00_world_conditions.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_10_01_world_loot_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_10_02_world_script_texts.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_10_03_world_quest_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_10_04_world_gossip.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_10_05_world_quest_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_10_06_world_creature.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_11_00_world_creature_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_11_01_world_quest_poi.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_12_00_world_conditions.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_12_01_world_spell_script_names.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_12_02_world_spell_script_names.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_13_00_world_creature_text.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_13_01_world_creature.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_14_00_world_creature_text.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_14_01_world_creature_text.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_14_02_world_creature.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_16_00_world_creature_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_16_00_world_spell_dbc.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_17_00_world_spell_dbc.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_19_00_world_pickpocketing_loot_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_19_01_world_spell_dbc.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_20_00_world_spell_script_names.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_20_01_world_wintergrasp_conditions.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_20_02_world_wintergrasp_creatures.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_20_03_world_wintergrasp_gameobjects.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_20_04_world_wintergrasp_gossips.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_20_05_world_wintergrasp_quests.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_20_06_world_wintergrasp_spells.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_20_07_world_wintergrasp_texts.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_20_08_world_achievement_criteria_data.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_20_09_world_disables.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_21_00_world_spell_proc_event.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_21_01_world_command.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_21_02_world_wintergrasp_conditions.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_23_00_world_wintergrasp_spell_script_names.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_23_01_world_wintergrasp_gameobject.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_25_00_world_creature_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_25_01_world_creature_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_26_00_world_conditions.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_26_01_world_creature.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_26_02_world_spell_area.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_26_03_world_spell_area.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_27_00_world_creature_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_27_00_world_spell_script_name.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_27_01_world_sai.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_27_02_world_creature.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_27_02_world_playercreateinfo_spell.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_27_03_world_gameobject.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_27_04_world_quest_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_27_05_world_sai.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_27_06_world_sai.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_27_07_world_spell_area.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_27_08_world_misc.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_27_09_world_conditions.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_27_10_world_spell_script_names.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_28_00_world_spell_script_name.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_28_01_world_achievement_criteria_data.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_29_00_world_blood_furnace.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_30_00_world_creature_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_30_00_world_spell_script_names.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_31_00_world_command.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_08_31_00_world_sai.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_01_00_world_spell_script_names.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_02_00_world_quest_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_02_01_world_sai.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_03_00_world_misc.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_03_01_world_gameobject_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_03_02_world_quest_template.sql rename to 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 similarity index 100% rename from sql/updates/characters/2012_09_07_00_characters_characters.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_07_00_world_spell_bonus_data.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_07_01_world_creature_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_07_02_world_spell_script_names.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_08_00_world_achievement_criteria_data.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_08_01_world_creature_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_08_02_world_achievement_criteria_data.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_09_00_world_command.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_09_01_world_trinity_string.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_09_02_world_spell_script_names.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_09_03_world_spell_bonus_data.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_09_04_world_quest_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_10_00_world_game_event.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_10_01_world_quest_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_10_02_world_creature_text.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_10_03_world_quest_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_10_04_world_quest_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_10_06_world_creature_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_10_07_world_go_loot_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_10_08_world_spell_area.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_10_09_world_creature_involvedrelation.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_10_10_world_gossips.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_10_11_world_event_scripts.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_10_12_world_sai.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_10_13_world_creature_model_info.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_11_00_world_misc.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_12_00_world_misc.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_12_01_world_creature.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_13_00_world_item_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_13_01_world_fires_over_skettis.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_13_01_world_ogrila.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_13_01_world_spell_script_name.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_13_01_world_spell_target_position.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_13_02_world_trinity_string.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_14_00_world_creature_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_14_00_world_sai.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_14_01_world_creature_loot_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_15_00_world_achievement_criteria_data.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_15_00_world_creature_template.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_15_00_world_disables.sql rename to 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 similarity index 100% rename from sql/updates/world/2012_09_15_01_world_creature_loot_template.sql rename to 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 0000000000..74a1cf6749 --- /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 0000000000..64f87262d0 --- /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 0000000000..2d87ad3aa1 --- /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 0000000000..15415e856f --- /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 0000000000..d50f45bb02 --- /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 0000000000..8b7e6aa92b --- /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 7628906f0f..ddf450d2d5 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 3b0e6cc69f..bd72015d76 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 06919a43a4..39e4c7bbe5 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 88a8fe0865..4971685fe1 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 cffd3faeb8..39cc06cec1 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 145251ec4a..c275c33032 100755 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp @@ -79,6 +79,7 @@ void TargetedMovementGeneratorMedium::_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 bffca8f5ce..121e702bfa 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 4792a9c4e5..0476b2cbac 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 f53020a72c..b987b00fa5 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); }