Merge branch 'master' into 4.3.4

Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Battlegrounds/BattlegroundQueue.cpp
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.cpp
	src/server/game/Movement/Spline/MovementUtil.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Packets/ByteBuffer.h

339 files changed, 324 insertions, 0 deletions

diff --git a/sql/updates/world/2012_09_16_00_world_version.sql b/sql/old/3.3.5a/2012_09_16_00_world_version.sql
index 74a1cf67499..74a1cf67499 100644
--- a/sql/updates/world/2012_09_16_00_world_version.sql
+++ b/sql/old/3.3.5a/2012_09_16_00_world_version.sql
diff --git a/sql/updates/world/2012_09_16_01_world_conditions.sql b/sql/old/3.3.5a/2012_09_16_01_world_conditions.sql
index 64f87262d0e..64f87262d0e 100644
--- a/sql/updates/world/2012_09_16_01_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_09_16_01_world_conditions.sql
diff --git a/sql/updates/world/2012_09_16_01_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_09_16_01_world_creature_loot_template.sql
index 2d87ad3aa16..2d87ad3aa16 100644
--- a/sql/updates/world/2012_09_16_01_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_09_16_01_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_09_16_01_world_creature_template_addon.sql b/sql/old/3.3.5a/2012_09_16_01_world_creature_template_addon.sql
index c23a38cd058..c23a38cd058 100644
--- a/sql/updates/world/2012_09_16_01_world_creature_template_addon.sql
+++ b/sql/old/3.3.5a/2012_09_16_01_world_creature_template_addon.sql
diff --git a/sql/updates/world/2012_09_16_02_world_fires_over_skettis.sql b/sql/old/3.3.5a/2012_09_16_02_world_fires_over_skettis.sql
index d50f45bb020..d50f45bb020 100644
--- a/sql/updates/world/2012_09_16_02_world_fires_over_skettis.sql
+++ b/sql/old/3.3.5a/2012_09_16_02_world_fires_over_skettis.sql
diff --git a/sql/updates/world/2012_09_16_03_world_spell_script_names.sql b/sql/old/3.3.5a/2012_09_16_03_world_spell_script_names.sql
index 8b7e6aa92ba..8b7e6aa92ba 100644
--- a/sql/updates/world/2012_09_16_03_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_09_16_03_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_09_17_00_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_09_17_00_world_spell_bonus_data.sql
index 0d16742393e..0d16742393e 100644
--- a/sql/updates/world/2012_09_17_00_world_spell_bonus_data.sql
+++ b/sql/old/3.3.5a/2012_09_17_00_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2012_09_17_01_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_09_17_01_world_spell_bonus_data.sql
index f9283233c8e..f9283233c8e 100644
--- a/sql/updates/world/2012_09_17_01_world_spell_bonus_data.sql
+++ b/sql/old/3.3.5a/2012_09_17_01_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2012_09_17_01_world_spell_script_names.sql b/sql/old/3.3.5a/2012_09_17_01_world_spell_script_names.sql
index 255c76e6b70..255c76e6b70 100644
--- a/sql/updates/world/2012_09_17_01_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_09_17_01_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_09_17_02_world_misc.sql b/sql/old/3.3.5a/2012_09_17_02_world_misc.sql
index 378833dfc52..378833dfc52 100644
--- a/sql/updates/world/2012_09_17_02_world_misc.sql
+++ b/sql/old/3.3.5a/2012_09_17_02_world_misc.sql
diff --git a/sql/updates/world/2012_09_18_00_world_creature_template.sql b/sql/old/3.3.5a/2012_09_18_00_world_creature_template.sql
index 5ead9430d60..5ead9430d60 100644
--- a/sql/updates/world/2012_09_18_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_09_18_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_09_18_01_world_creature_template.sql b/sql/old/3.3.5a/2012_09_18_01_world_creature_template.sql
index 4e31e7f6f68..4e31e7f6f68 100644
--- a/sql/updates/world/2012_09_18_01_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_09_18_01_world_creature_template.sql
diff --git a/sql/updates/world/2012_09_19_00_world_dwarfageddon.sql b/sql/old/3.3.5a/2012_09_19_00_world_dwarfageddon.sql
index 1eda383b67d..1eda383b67d 100644
--- a/sql/updates/world/2012_09_19_00_world_dwarfageddon.sql
+++ b/sql/old/3.3.5a/2012_09_19_00_world_dwarfageddon.sql
diff --git a/sql/updates/world/2012_09_19_00_world_reference_loot_template.sql b/sql/old/3.3.5a/2012_09_19_00_world_reference_loot_template.sql
index 7db30ede52b..7db30ede52b 100644
--- a/sql/updates/world/2012_09_19_00_world_reference_loot_template.sql
+++ b/sql/old/3.3.5a/2012_09_19_00_world_reference_loot_template.sql
diff --git a/sql/updates/world/2012_09_20_00_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_09_20_00_world_creature_loot_template.sql
index 8463b064bf9..8463b064bf9 100644
--- a/sql/updates/world/2012_09_20_00_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_09_20_00_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_09_22_01_world_i_was_a_lot_of_things.sql b/sql/old/3.3.5a/2012_09_22_01_world_i_was_a_lot_of_things.sql
index 95fc92daa76..95fc92daa76 100644
--- a/sql/updates/world/2012_09_22_01_world_i_was_a_lot_of_things.sql
+++ b/sql/old/3.3.5a/2012_09_22_01_world_i_was_a_lot_of_things.sql
diff --git a/sql/updates/world/2012_09_22_03_world_game_event.sql b/sql/old/3.3.5a/2012_09_22_03_world_game_event.sql
index 5e05ba03898..5e05ba03898 100644
--- a/sql/updates/world/2012_09_22_03_world_game_event.sql
+++ b/sql/old/3.3.5a/2012_09_22_03_world_game_event.sql
diff --git a/sql/updates/world/2012_09_24_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_09_24_00_world_spell_script_names.sql
index 611325d4b11..611325d4b11 100644
--- a/sql/updates/world/2012_09_24_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_09_24_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_09_24_01_world_spell_script_names.sql b/sql/old/3.3.5a/2012_09_24_01_world_spell_script_names.sql
index e14b6833a09..e14b6833a09 100644
--- a/sql/updates/world/2012_09_24_01_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_09_24_01_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_09_24_02_world_misc.sql b/sql/old/3.3.5a/2012_09_24_02_world_misc.sql
index b4cf7fda0a5..b4cf7fda0a5 100644
--- a/sql/updates/world/2012_09_24_02_world_misc.sql
+++ b/sql/old/3.3.5a/2012_09_24_02_world_misc.sql
diff --git a/sql/updates/world/2012_09_24_03_world_misc.sql b/sql/old/3.3.5a/2012_09_24_03_world_misc.sql
index 3bcb40f79c0..3bcb40f79c0 100644
--- a/sql/updates/world/2012_09_24_03_world_misc.sql
+++ b/sql/old/3.3.5a/2012_09_24_03_world_misc.sql
diff --git a/sql/updates/world/2012_09_26_00_world_misc.sql b/sql/old/3.3.5a/2012_09_26_00_world_misc.sql
index d9ac468f4a6..d9ac468f4a6 100644
--- a/sql/updates/world/2012_09_26_00_world_misc.sql
+++ b/sql/old/3.3.5a/2012_09_26_00_world_misc.sql
diff --git a/sql/updates/world/2012_09_26_01_world_spell_bonus_data.sql b/sql/old/3.3.5a/2012_09_26_01_world_spell_bonus_data.sql
index 3aeeb7c6525..3aeeb7c6525 100644
--- a/sql/updates/world/2012_09_26_01_world_spell_bonus_data.sql
+++ b/sql/old/3.3.5a/2012_09_26_01_world_spell_bonus_data.sql
diff --git a/sql/updates/world/2012_09_27_01_world_custodian_of_time.sql b/sql/old/3.3.5a/2012_09_27_01_world_custodian_of_time.sql
index 521c55d507e..521c55d507e 100644
--- a/sql/updates/world/2012_09_27_01_world_custodian_of_time.sql
+++ b/sql/old/3.3.5a/2012_09_27_01_world_custodian_of_time.sql
diff --git a/sql/updates/world/2012_09_28_00_world_creature_model_info.sql b/sql/old/3.3.5a/2012_09_28_00_world_creature_model_info.sql
index 48134d7bbed..48134d7bbed 100644
--- a/sql/updates/world/2012_09_28_00_world_creature_model_info.sql
+++ b/sql/old/3.3.5a/2012_09_28_00_world_creature_model_info.sql
diff --git a/sql/updates/world/2012_09_29_00_world_creature_model_info.sql b/sql/old/3.3.5a/2012_09_29_00_world_creature_model_info.sql
index 0c63a0b2f73..0c63a0b2f73 100644
--- a/sql/updates/world/2012_09_29_00_world_creature_model_info.sql
+++ b/sql/old/3.3.5a/2012_09_29_00_world_creature_model_info.sql
diff --git a/sql/updates/world/2012_09_29_01_world_creature_text.sql b/sql/old/3.3.5a/2012_09_29_01_world_creature_text.sql
index 8fde66d2e6e..8fde66d2e6e 100644
--- a/sql/updates/world/2012_09_29_01_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_09_29_01_world_creature_text.sql
diff --git a/sql/updates/world/2012_09_30_00_world_creature_text.sql b/sql/old/3.3.5a/2012_09_30_00_world_creature_text.sql
index e0f9f210d7b..e0f9f210d7b 100644
--- a/sql/updates/world/2012_09_30_00_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_09_30_00_world_creature_text.sql
diff --git a/sql/updates/world/2012_09_30_01_world_player_factionchange_titles.sql b/sql/old/3.3.5a/2012_09_30_01_world_player_factionchange_titles.sql
index 99d7fc871d8..99d7fc871d8 100644
--- a/sql/updates/world/2012_09_30_01_world_player_factionchange_titles.sql
+++ b/sql/old/3.3.5a/2012_09_30_01_world_player_factionchange_titles.sql
diff --git a/sql/updates/world/2012_09_30_02_world_creature_text.sql b/sql/old/3.3.5a/2012_09_30_02_world_creature_text.sql
index 81e77bcd682..81e77bcd682 100644
--- a/sql/updates/world/2012_09_30_02_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_09_30_02_world_creature_text.sql
diff --git a/sql/updates/world/2012_09_30_03_world_creature_text.sql b/sql/old/3.3.5a/2012_09_30_03_world_creature_text.sql
index a591f8cfb7c..a591f8cfb7c 100644
--- a/sql/updates/world/2012_09_30_03_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_09_30_03_world_creature_text.sql
diff --git a/sql/updates/world/2012_10_02_00_world_oculus.sql b/sql/old/3.3.5a/2012_10_02_00_world_oculus.sql
index 8c9ea1bcb60..8c9ea1bcb60 100644
--- a/sql/updates/world/2012_10_02_00_world_oculus.sql
+++ b/sql/old/3.3.5a/2012_10_02_00_world_oculus.sql
diff --git a/sql/updates/world/2012_10_04_00_world_spelldifficulty_dbc.sql b/sql/old/3.3.5a/2012_10_04_00_world_spelldifficulty_dbc.sql
index 6587e35bf9b..6587e35bf9b 100644
--- a/sql/updates/world/2012_10_04_00_world_spelldifficulty_dbc.sql
+++ b/sql/old/3.3.5a/2012_10_04_00_world_spelldifficulty_dbc.sql
diff --git a/sql/updates/world/2012_10_04_01_world_script_texts.sql b/sql/old/3.3.5a/2012_10_04_01_world_script_texts.sql
index 8281d16794e..8281d16794e 100644
--- a/sql/updates/world/2012_10_04_01_world_script_texts.sql
+++ b/sql/old/3.3.5a/2012_10_04_01_world_script_texts.sql
diff --git a/sql/updates/world/2012_10_05_00_world_misc.sql b/sql/old/3.3.5a/2012_10_05_00_world_misc.sql
index f715b9491ef..f715b9491ef 100644
--- a/sql/updates/world/2012_10_05_00_world_misc.sql
+++ b/sql/old/3.3.5a/2012_10_05_00_world_misc.sql
diff --git a/sql/updates/world/2012_10_05_01_world_spell_script_names.sql b/sql/old/3.3.5a/2012_10_05_01_world_spell_script_names.sql
index c7269b981ec..c7269b981ec 100644
--- a/sql/updates/world/2012_10_05_01_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_10_05_01_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_10_06_00_world_spell_difficulty.sql b/sql/old/3.3.5a/2012_10_06_00_world_spell_difficulty.sql
index 1dd1a468990..1dd1a468990 100644
--- a/sql/updates/world/2012_10_06_00_world_spell_difficulty.sql
+++ b/sql/old/3.3.5a/2012_10_06_00_world_spell_difficulty.sql
diff --git a/sql/updates/world/2012_10_06_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_10_06_00_world_spell_script_names.sql
index 4fa3b922d62..4fa3b922d62 100644
--- a/sql/updates/world/2012_10_06_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_10_06_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_10_06_01_world_spell_dbc.sql b/sql/old/3.3.5a/2012_10_06_01_world_spell_dbc.sql
index 071d83582ac..071d83582ac 100644
--- a/sql/updates/world/2012_10_06_01_world_spell_dbc.sql
+++ b/sql/old/3.3.5a/2012_10_06_01_world_spell_dbc.sql
diff --git a/sql/updates/world/2012_10_06_02_world_misc_templates.sql b/sql/old/3.3.5a/2012_10_06_02_world_misc_templates.sql
index 5ec006c310d..5ec006c310d 100644
--- a/sql/updates/world/2012_10_06_02_world_misc_templates.sql
+++ b/sql/old/3.3.5a/2012_10_06_02_world_misc_templates.sql
diff --git a/sql/updates/world/2012_10_06_03_world_creature_text.sql b/sql/old/3.3.5a/2012_10_06_03_world_creature_text.sql
index 6716b12cea9..6716b12cea9 100644
--- a/sql/updates/world/2012_10_06_03_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_10_06_03_world_creature_text.sql
diff --git a/sql/updates/world/2012_10_06_04_world_misc_spawns.sql b/sql/old/3.3.5a/2012_10_06_04_world_misc_spawns.sql
index e53302d2c2f..e53302d2c2f 100644
--- a/sql/updates/world/2012_10_06_04_world_misc_spawns.sql
+++ b/sql/old/3.3.5a/2012_10_06_04_world_misc_spawns.sql
diff --git a/sql/updates/world/2012_10_06_05_world_spell_script_names.sql b/sql/old/3.3.5a/2012_10_06_05_world_spell_script_names.sql
index 354a359e45b..354a359e45b 100644
--- a/sql/updates/world/2012_10_06_05_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_10_06_05_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_10_07_00_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_10_07_00_world_creature_loot_template.sql
index 2829725c76c..2829725c76c 100644
--- a/sql/updates/world/2012_10_07_00_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_10_07_00_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_10_07_01_world_spell_proc_event.sql b/sql/old/3.3.5a/2012_10_07_01_world_spell_proc_event.sql
index 810cd90290c..810cd90290c 100644
--- a/sql/updates/world/2012_10_07_01_world_spell_proc_event.sql
+++ b/sql/old/3.3.5a/2012_10_07_01_world_spell_proc_event.sql
diff --git a/sql/updates/characters/2012_10_09_00_character_glyphs.sql b/sql/old/3.3.5a/2012_10_09_00_character_glyphs.sql
index b90fa7d7682..b90fa7d7682 100644
--- a/sql/updates/characters/2012_10_09_00_character_glyphs.sql
+++ b/sql/old/3.3.5a/2012_10_09_00_character_glyphs.sql
diff --git a/sql/updates/world/2012_10_09_00_world_spell_groups.sql b/sql/old/3.3.5a/2012_10_09_00_world_spell_groups.sql
index 71f58c6322e..71f58c6322e 100644
--- a/sql/updates/world/2012_10_09_00_world_spell_groups.sql
+++ b/sql/old/3.3.5a/2012_10_09_00_world_spell_groups.sql
diff --git a/sql/updates/world/2012_10_09_01_world_spell_groups.sql b/sql/old/3.3.5a/2012_10_09_01_world_spell_groups.sql
index 75c57d0f77f..75c57d0f77f 100644
--- a/sql/updates/world/2012_10_09_01_world_spell_groups.sql
+++ b/sql/old/3.3.5a/2012_10_09_01_world_spell_groups.sql
diff --git a/sql/updates/world/2012_10_09_02_world_spell_groups.sql b/sql/old/3.3.5a/2012_10_09_02_world_spell_groups.sql
index 8e4864bc039..8e4864bc039 100644
--- a/sql/updates/world/2012_10_09_02_world_spell_groups.sql
+++ b/sql/old/3.3.5a/2012_10_09_02_world_spell_groups.sql
diff --git a/sql/updates/world/2012_10_10_00_world_battleground_template.sql b/sql/old/3.3.5a/2012_10_10_00_world_battleground_template.sql
index 2dcafc51161..2dcafc51161 100644
--- a/sql/updates/world/2012_10_10_00_world_battleground_template.sql
+++ b/sql/old/3.3.5a/2012_10_10_00_world_battleground_template.sql
diff --git a/sql/updates/world/2012_10_11_00_world_gameobject.sql b/sql/old/3.3.5a/2012_10_11_00_world_gameobject.sql
index e58d60590cb..e58d60590cb 100644
--- a/sql/updates/world/2012_10_11_00_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_10_11_00_world_gameobject.sql
diff --git a/sql/updates/world/2012_10_13_00_world_creature_template.sql b/sql/old/3.3.5a/2012_10_13_00_world_creature_template.sql
index 7dc7a463f3f..7dc7a463f3f 100644
--- a/sql/updates/world/2012_10_13_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_10_13_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_10_14_00_world_creature.sql b/sql/old/3.3.5a/2012_10_14_00_world_creature.sql
index dd650f37aef..dd650f37aef 100644
--- a/sql/updates/world/2012_10_14_00_world_creature.sql
+++ b/sql/old/3.3.5a/2012_10_14_00_world_creature.sql
diff --git a/sql/updates/world/2012_10_16_00_world_spell_area.sql b/sql/old/3.3.5a/2012_10_16_00_world_spell_area.sql
index 3dbc29d077f..3dbc29d077f 100644
--- a/sql/updates/world/2012_10_16_00_world_spell_area.sql
+++ b/sql/old/3.3.5a/2012_10_16_00_world_spell_area.sql
diff --git a/sql/updates/characters/2012_10_17_00_character_gm_tickets.sql b/sql/old/3.3.5a/2012_10_17_00_character_gm_tickets.sql
index affb23f836c..affb23f836c 100644
--- a/sql/updates/characters/2012_10_17_00_character_gm_tickets.sql
+++ b/sql/old/3.3.5a/2012_10_17_00_character_gm_tickets.sql
diff --git a/sql/updates/world/2012_10_20_00_world_transports.sql b/sql/old/3.3.5a/2012_10_20_00_world_transports.sql
index 8cc2bae4b47..8cc2bae4b47 100644
--- a/sql/updates/world/2012_10_20_00_world_transports.sql
+++ b/sql/old/3.3.5a/2012_10_20_00_world_transports.sql
diff --git a/sql/updates/world/2012_10_20_01_world_spell_script_names.sql b/sql/old/3.3.5a/2012_10_20_01_world_spell_script_names.sql
index 814f1b40e65..814f1b40e65 100644
--- a/sql/updates/world/2012_10_20_01_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_10_20_01_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_10_20_02_world_creature_text.sql b/sql/old/3.3.5a/2012_10_20_02_world_creature_text.sql
index bb153c6b2f6..bb153c6b2f6 100644
--- a/sql/updates/world/2012_10_20_02_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_10_20_02_world_creature_text.sql
diff --git a/sql/updates/world/2012_10_21_00_world_conditions.sql b/sql/old/3.3.5a/2012_10_21_00_world_conditions.sql
index 62161a932f9..62161a932f9 100644
--- a/sql/updates/world/2012_10_21_00_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_10_21_00_world_conditions.sql
diff --git a/sql/updates/world/2012_10_21_01_world_misc.sql b/sql/old/3.3.5a/2012_10_21_01_world_misc.sql
index fe74f8a7a80..fe74f8a7a80 100644
--- a/sql/updates/world/2012_10_21_01_world_misc.sql
+++ b/sql/old/3.3.5a/2012_10_21_01_world_misc.sql
diff --git a/sql/updates/world/2012_10_23_00_world_trinity_string.sql b/sql/old/3.3.5a/2012_10_23_00_world_trinity_string.sql
index 60318667fbc..60318667fbc 100644
--- a/sql/updates/world/2012_10_23_00_world_trinity_string.sql
+++ b/sql/old/3.3.5a/2012_10_23_00_world_trinity_string.sql
diff --git a/sql/updates/world/2012_10_23_01_world_command.sql b/sql/old/3.3.5a/2012_10_23_01_world_command.sql
index b46882c5949..b46882c5949 100644
--- a/sql/updates/world/2012_10_23_01_world_command.sql
+++ b/sql/old/3.3.5a/2012_10_23_01_world_command.sql
diff --git a/sql/updates/world/2012_10_25_00_world_childrens_week.sql b/sql/old/3.3.5a/2012_10_25_00_world_childrens_week.sql
index f10cf92b409..f10cf92b409 100644
--- a/sql/updates/world/2012_10_25_00_world_childrens_week.sql
+++ b/sql/old/3.3.5a/2012_10_25_00_world_childrens_week.sql
diff --git a/sql/updates/world/2012_10_26_00_world_sai.sql b/sql/old/3.3.5a/2012_10_26_00_world_sai.sql
index 8e4c2fa0922..8e4c2fa0922 100644
--- a/sql/updates/world/2012_10_26_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_10_26_00_world_sai.sql
diff --git a/sql/updates/world/2012_10_27_00_world_creature.sql b/sql/old/3.3.5a/2012_10_27_00_world_creature.sql
index c00c450aeca..c00c450aeca 100644
--- a/sql/updates/world/2012_10_27_00_world_creature.sql
+++ b/sql/old/3.3.5a/2012_10_27_00_world_creature.sql
diff --git a/sql/updates/world/2012_10_27_01_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_10_27_01_world_creature_loot_template.sql
index 3367dbf0fa8..3367dbf0fa8 100644
--- a/sql/updates/world/2012_10_27_01_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_10_27_01_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_10_29_00_world_conditions.sql b/sql/old/3.3.5a/2012_10_29_00_world_conditions.sql
index d1fac5361fb..d1fac5361fb 100644
--- a/sql/updates/world/2012_10_29_00_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_10_29_00_world_conditions.sql
diff --git a/sql/updates/characters/2012_11_02_00_character_misc.sql b/sql/old/3.3.5a/2012_11_02_00_character_misc.sql
index 9cbbd423bb8..9cbbd423bb8 100644
--- a/sql/updates/characters/2012_11_02_00_character_misc.sql
+++ b/sql/old/3.3.5a/2012_11_02_00_character_misc.sql
diff --git a/sql/updates/world/2012_11_03_00_world_creature_loot_template.sql b/sql/old/3.3.5a/2012_11_03_00_world_creature_loot_template.sql
index 0e5c39b796d..0e5c39b796d 100644
--- a/sql/updates/world/2012_11_03_00_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2012_11_03_00_world_creature_loot_template.sql
diff --git a/sql/updates/world/2012_11_07_00_world_misc.sql b/sql/old/3.3.5a/2012_11_07_00_world_misc.sql
index db7c8f66fb1..db7c8f66fb1 100644
--- a/sql/updates/world/2012_11_07_00_world_misc.sql
+++ b/sql/old/3.3.5a/2012_11_07_00_world_misc.sql
diff --git a/sql/updates/world/2012_11_11_00_world_sai.sql b/sql/old/3.3.5a/2012_11_11_00_world_sai.sql
index b5eedd86898..b5eedd86898 100644
--- a/sql/updates/world/2012_11_11_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_11_11_00_world_sai.sql
diff --git a/sql/updates/world/2012_11_11_01_world_quest_template.sql b/sql/old/3.3.5a/2012_11_11_01_world_quest_template.sql
index 9abf2ea3cd1..9abf2ea3cd1 100644
--- a/sql/updates/world/2012_11_11_01_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_11_11_01_world_quest_template.sql
diff --git a/sql/updates/world/2012_11_11_02_world_gossip_menu.sql b/sql/old/3.3.5a/2012_11_11_02_world_gossip_menu.sql
index 59d1a10b337..59d1a10b337 100644
--- a/sql/updates/world/2012_11_11_02_world_gossip_menu.sql
+++ b/sql/old/3.3.5a/2012_11_11_02_world_gossip_menu.sql
diff --git a/sql/updates/world/2012_11_11_03_world_gossip_menu.sql b/sql/old/3.3.5a/2012_11_11_03_world_gossip_menu.sql
index 4f250597388..4f250597388 100644
--- a/sql/updates/world/2012_11_11_03_world_gossip_menu.sql
+++ b/sql/old/3.3.5a/2012_11_11_03_world_gossip_menu.sql
diff --git a/sql/updates/world/2012_11_12_00_world_quest_template.sql b/sql/old/3.3.5a/2012_11_12_00_world_quest_template.sql
index ee2206146b3..ee2206146b3 100644
--- a/sql/updates/world/2012_11_12_00_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_11_12_00_world_quest_template.sql
diff --git a/sql/updates/world/2012_11_12_01_world_misc.sql b/sql/old/3.3.5a/2012_11_12_01_world_misc.sql
index 7a5e81c4b1a..7a5e81c4b1a 100644
--- a/sql/updates/world/2012_11_12_01_world_misc.sql
+++ b/sql/old/3.3.5a/2012_11_12_01_world_misc.sql
diff --git a/sql/updates/world/2012_11_12_02_world_quest_template.sql b/sql/old/3.3.5a/2012_11_12_02_world_quest_template.sql
index 8f988bfa4ab..8f988bfa4ab 100644
--- a/sql/updates/world/2012_11_12_02_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_11_12_02_world_quest_template.sql
diff --git a/sql/updates/world/2012_11_12_03_world_misc.sql b/sql/old/3.3.5a/2012_11_12_03_world_misc.sql
index 20c91974bbb..20c91974bbb 100644
--- a/sql/updates/world/2012_11_12_03_world_misc.sql
+++ b/sql/old/3.3.5a/2012_11_12_03_world_misc.sql
diff --git a/sql/updates/world/2012_11_13_00_world_waypoints.sql b/sql/old/3.3.5a/2012_11_13_00_world_waypoints.sql
index 64e16cb2d0e..64e16cb2d0e 100644
--- a/sql/updates/world/2012_11_13_00_world_waypoints.sql
+++ b/sql/old/3.3.5a/2012_11_13_00_world_waypoints.sql
diff --git a/sql/updates/world/2012_11_13_01_world_misc.sql b/sql/old/3.3.5a/2012_11_13_01_world_misc.sql
index 97e3cd8b499..97e3cd8b499 100644
--- a/sql/updates/world/2012_11_13_01_world_misc.sql
+++ b/sql/old/3.3.5a/2012_11_13_01_world_misc.sql
diff --git a/sql/updates/world/2012_11_13_02_world_creature.sql b/sql/old/3.3.5a/2012_11_13_02_world_creature.sql
index 19f278ca5c6..19f278ca5c6 100644
--- a/sql/updates/world/2012_11_13_02_world_creature.sql
+++ b/sql/old/3.3.5a/2012_11_13_02_world_creature.sql
diff --git a/sql/updates/world/2012_11_13_03_world_gameevent.sql b/sql/old/3.3.5a/2012_11_13_03_world_gameevent.sql
index fbb24b863f2..fbb24b863f2 100644
--- a/sql/updates/world/2012_11_13_03_world_gameevent.sql
+++ b/sql/old/3.3.5a/2012_11_13_03_world_gameevent.sql
diff --git a/sql/updates/world/2012_11_13_04_world_gameeventquest.sql b/sql/old/3.3.5a/2012_11_13_04_world_gameeventquest.sql
index cce654859e0..cce654859e0 100644
--- a/sql/updates/world/2012_11_13_04_world_gameeventquest.sql
+++ b/sql/old/3.3.5a/2012_11_13_04_world_gameeventquest.sql
diff --git a/sql/updates/world/2012_11_13_05_world_player_factionchange_items.sql b/sql/old/3.3.5a/2012_11_13_05_world_player_factionchange_items.sql
index 17b9616624a..17b9616624a 100644
--- a/sql/updates/world/2012_11_13_05_world_player_factionchange_items.sql
+++ b/sql/old/3.3.5a/2012_11_13_05_world_player_factionchange_items.sql
diff --git a/sql/updates/world/2012_11_13_06_world_trinity_string.sql b/sql/old/3.3.5a/2012_11_13_06_world_trinity_string.sql
index 2834a8f900b..2834a8f900b 100644
--- a/sql/updates/world/2012_11_13_06_world_trinity_string.sql
+++ b/sql/old/3.3.5a/2012_11_13_06_world_trinity_string.sql
diff --git a/sql/updates/world/2012_11_14_00_world_sai.sql b/sql/old/3.3.5a/2012_11_14_00_world_sai.sql
index 98467fe4f3a..98467fe4f3a 100644
--- a/sql/updates/world/2012_11_14_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_11_14_00_world_sai.sql
diff --git a/sql/updates/world/2012_11_14_00_world_various_fixes.sql b/sql/old/3.3.5a/2012_11_14_00_world_various_fixes.sql
index 01655b674b1..01655b674b1 100644
--- a/sql/updates/world/2012_11_14_00_world_various_fixes.sql
+++ b/sql/old/3.3.5a/2012_11_14_00_world_various_fixes.sql
diff --git a/sql/updates/world/2012_11_14_02_world_battleground_template.sql b/sql/old/3.3.5a/2012_11_14_02_world_battleground_template.sql
index b69216ea380..b69216ea380 100644
--- a/sql/updates/world/2012_11_14_02_world_battleground_template.sql
+++ b/sql/old/3.3.5a/2012_11_14_02_world_battleground_template.sql
diff --git a/sql/updates/world/2012_11_16_00_world_utgarde.sql b/sql/old/3.3.5a/2012_11_16_00_world_utgarde.sql
index 1948796a77b..1948796a77b 100644
--- a/sql/updates/world/2012_11_16_00_world_utgarde.sql
+++ b/sql/old/3.3.5a/2012_11_16_00_world_utgarde.sql
diff --git a/sql/updates/world/2012_11_16_01_world_utgarde.sql b/sql/old/3.3.5a/2012_11_16_01_world_utgarde.sql
index 30a64b02e3a..30a64b02e3a 100644
--- a/sql/updates/world/2012_11_16_01_world_utgarde.sql
+++ b/sql/old/3.3.5a/2012_11_16_01_world_utgarde.sql
diff --git a/sql/updates/world/2012_11_16_02_world_creature_ai_summons.sql b/sql/old/3.3.5a/2012_11_16_02_world_creature_ai_summons.sql
index 7d2caf76e33..7d2caf76e33 100644
--- a/sql/updates/world/2012_11_16_02_world_creature_ai_summons.sql
+++ b/sql/old/3.3.5a/2012_11_16_02_world_creature_ai_summons.sql
diff --git a/sql/updates/world/2012_11_17_00_world_various_fixes.sql b/sql/old/3.3.5a/2012_11_17_00_world_various_fixes.sql
index 981d378217f..981d378217f 100644
--- a/sql/updates/world/2012_11_17_00_world_various_fixes.sql
+++ b/sql/old/3.3.5a/2012_11_17_00_world_various_fixes.sql
diff --git a/sql/updates/characters/2012_11_18_00_character_calendar.sql b/sql/old/3.3.5a/2012_11_18_00_character_calendar.sql
index a3e7c352788..a3e7c352788 100644
--- a/sql/updates/characters/2012_11_18_00_character_calendar.sql
+++ b/sql/old/3.3.5a/2012_11_18_00_character_calendar.sql
diff --git a/sql/updates/world/2012_11_18_00_world_ormorok.sql b/sql/old/3.3.5a/2012_11_18_00_world_ormorok.sql
index 0ec8d13fd64..0ec8d13fd64 100644
--- a/sql/updates/world/2012_11_18_00_world_ormorok.sql
+++ b/sql/old/3.3.5a/2012_11_18_00_world_ormorok.sql
diff --git a/sql/updates/world/2012_11_18_01_world_creature_text.sql b/sql/old/3.3.5a/2012_11_18_01_world_creature_text.sql
index 5d8da97f1f0..5d8da97f1f0 100644
--- a/sql/updates/world/2012_11_18_01_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_11_18_01_world_creature_text.sql
diff --git a/sql/updates/world/2012_11_18_01_world_gameobject.sql b/sql/old/3.3.5a/2012_11_18_01_world_gameobject.sql
index d82f9a07e7e..d82f9a07e7e 100644
--- a/sql/updates/world/2012_11_18_01_world_gameobject.sql
+++ b/sql/old/3.3.5a/2012_11_18_01_world_gameobject.sql
diff --git a/sql/updates/world/2012_11_18_02_world_toc.sql b/sql/old/3.3.5a/2012_11_18_02_world_toc.sql
index 9262aceed7a..9262aceed7a 100644
--- a/sql/updates/world/2012_11_18_02_world_toc.sql
+++ b/sql/old/3.3.5a/2012_11_18_02_world_toc.sql
diff --git a/sql/updates/world/2012_11_19_00_world_various_fixes.sql b/sql/old/3.3.5a/2012_11_19_00_world_various_fixes.sql
index ca78611fc0b..ca78611fc0b 100644
--- a/sql/updates/world/2012_11_19_00_world_various_fixes.sql
+++ b/sql/old/3.3.5a/2012_11_19_00_world_various_fixes.sql
diff --git a/sql/updates/world/2012_11_19_01_world_pilgrims_bounty.sql b/sql/old/3.3.5a/2012_11_19_01_world_pilgrims_bounty.sql
index 56cda092be6..56cda092be6 100644
--- a/sql/updates/world/2012_11_19_01_world_pilgrims_bounty.sql
+++ b/sql/old/3.3.5a/2012_11_19_01_world_pilgrims_bounty.sql
diff --git a/sql/updates/world/2012_11_19_02_world_misc.sql b/sql/old/3.3.5a/2012_11_19_02_world_misc.sql
index 1f792b8da41..1f792b8da41 100644
--- a/sql/updates/world/2012_11_19_02_world_misc.sql
+++ b/sql/old/3.3.5a/2012_11_19_02_world_misc.sql
diff --git a/sql/updates/world/2012_11_19_03_world_ysera.sql b/sql/old/3.3.5a/2012_11_19_03_world_ysera.sql
index 24a729f96dd..24a729f96dd 100644
--- a/sql/updates/world/2012_11_19_03_world_ysera.sql
+++ b/sql/old/3.3.5a/2012_11_19_03_world_ysera.sql
diff --git a/sql/updates/world/2012_11_20_00_world_creature_text.sql b/sql/old/3.3.5a/2012_11_20_00_world_creature_text.sql
index 5b89db507d8..5b89db507d8 100644
--- a/sql/updates/world/2012_11_20_00_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_11_20_00_world_creature_text.sql
diff --git a/sql/updates/world/2012_11_21_00_world_sai.sql b/sql/old/3.3.5a/2012_11_21_00_world_sai.sql
index 9cdd314bb8f..9cdd314bb8f 100644
--- a/sql/updates/world/2012_11_21_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_11_21_00_world_sai.sql
diff --git a/sql/updates/world/2012_11_24_00_world_conditions.sql b/sql/old/3.3.5a/2012_11_24_00_world_conditions.sql
index 1a5e5963c8e..1a5e5963c8e 100644
--- a/sql/updates/world/2012_11_24_00_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_11_24_00_world_conditions.sql
diff --git a/sql/updates/world/2012_11_24_00_world_creature_text.sql b/sql/old/3.3.5a/2012_11_24_00_world_creature_text.sql
index 60e0f9c3aa1..60e0f9c3aa1 100644
--- a/sql/updates/world/2012_11_24_00_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_11_24_00_world_creature_text.sql
diff --git a/sql/updates/world/2012_11_24_01_world_quest_start_scripts.sql b/sql/old/3.3.5a/2012_11_24_01_world_quest_start_scripts.sql
index 0f0506206a2..0f0506206a2 100644
--- a/sql/updates/world/2012_11_24_01_world_quest_start_scripts.sql
+++ b/sql/old/3.3.5a/2012_11_24_01_world_quest_start_scripts.sql
diff --git a/sql/updates/world/2012_11_24_02_world_creature_text.sql b/sql/old/3.3.5a/2012_11_24_02_world_creature_text.sql
index 8797039d967..8797039d967 100644
--- a/sql/updates/world/2012_11_24_02_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_11_24_02_world_creature_text.sql
diff --git a/sql/updates/world/2012_11_24_02_world_gossip_menu_option.sql b/sql/old/3.3.5a/2012_11_24_02_world_gossip_menu_option.sql
index e6f9ab551d3..e6f9ab551d3 100644
--- a/sql/updates/world/2012_11_24_02_world_gossip_menu_option.sql
+++ b/sql/old/3.3.5a/2012_11_24_02_world_gossip_menu_option.sql
diff --git a/sql/updates/world/2012_11_24_03_world_various_fixes.sql b/sql/old/3.3.5a/2012_11_24_03_world_various_fixes.sql
index dfa2d277564..dfa2d277564 100644
--- a/sql/updates/world/2012_11_24_03_world_various_fixes.sql
+++ b/sql/old/3.3.5a/2012_11_24_03_world_various_fixes.sql
diff --git a/sql/updates/world/2012_11_24_04_world_sai.sql b/sql/old/3.3.5a/2012_11_24_04_world_sai.sql
index 76cf4c18963..76cf4c18963 100644
--- a/sql/updates/world/2012_11_24_04_world_sai.sql
+++ b/sql/old/3.3.5a/2012_11_24_04_world_sai.sql
diff --git a/sql/updates/world/2012_11_25_00_world_various_fixes.sql b/sql/old/3.3.5a/2012_11_25_00_world_various_fixes.sql
index 3aabc755dde..3aabc755dde 100644
--- a/sql/updates/world/2012_11_25_00_world_various_fixes.sql
+++ b/sql/old/3.3.5a/2012_11_25_00_world_various_fixes.sql
diff --git a/sql/updates/world/2012_11_25_01_world_various_fixes.sql b/sql/old/3.3.5a/2012_11_25_01_world_various_fixes.sql
index 6114451174a..6114451174a 100644
--- a/sql/updates/world/2012_11_25_01_world_various_fixes.sql
+++ b/sql/old/3.3.5a/2012_11_25_01_world_various_fixes.sql
diff --git a/sql/updates/world/2012_11_26_02_world_conditions.sql b/sql/old/3.3.5a/2012_11_26_02_world_conditions.sql
index 861e999236d..861e999236d 100644
--- a/sql/updates/world/2012_11_26_02_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_11_26_02_world_conditions.sql
diff --git a/sql/updates/world/2012_11_26_03_world_misc.sql b/sql/old/3.3.5a/2012_11_26_03_world_misc.sql
index 5a6140e6bf3..5a6140e6bf3 100644
--- a/sql/updates/world/2012_11_26_03_world_misc.sql
+++ b/sql/old/3.3.5a/2012_11_26_03_world_misc.sql
diff --git a/sql/updates/world/2012_11_27_00_world_misc.sql b/sql/old/3.3.5a/2012_11_27_00_world_misc.sql
index 8c815a856fd..8c815a856fd 100644
--- a/sql/updates/world/2012_11_27_00_world_misc.sql
+++ b/sql/old/3.3.5a/2012_11_27_00_world_misc.sql
diff --git a/sql/updates/world/2012_11_27_01_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2012_11_27_01_world_achievement_criteria_data.sql
index 65cfced17f3..65cfced17f3 100644
--- a/sql/updates/world/2012_11_27_01_world_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2012_11_27_01_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2012_11_30_00_world_spell_script_names.sql b/sql/old/3.3.5a/2012_11_30_00_world_spell_script_names.sql
index cedee2fe51d..cedee2fe51d 100644
--- a/sql/updates/world/2012_11_30_00_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_11_30_00_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_12_01_00_world_assembly_of_iron.sql b/sql/old/3.3.5a/2012_12_01_00_world_assembly_of_iron.sql
index 090780d2bd4..090780d2bd4 100644
--- a/sql/updates/world/2012_12_01_00_world_assembly_of_iron.sql
+++ b/sql/old/3.3.5a/2012_12_01_00_world_assembly_of_iron.sql
diff --git a/sql/updates/world/2012_12_01_01_world_misc.sql b/sql/old/3.3.5a/2012_12_01_01_world_misc.sql
index 7523484d179..7523484d179 100644
--- a/sql/updates/world/2012_12_01_01_world_misc.sql
+++ b/sql/old/3.3.5a/2012_12_01_01_world_misc.sql
diff --git a/sql/updates/world/2012_12_01_02_world_creature_text.sql b/sql/old/3.3.5a/2012_12_01_02_world_creature_text.sql
index 6d4b50b9e88..6d4b50b9e88 100644
--- a/sql/updates/world/2012_12_01_02_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_12_01_02_world_creature_text.sql
diff --git a/sql/updates/world/2012_12_01_03_world_ulduar_creature_text.sql b/sql/old/3.3.5a/2012_12_01_03_world_ulduar_creature_text.sql
index 82d93d7b7ae..82d93d7b7ae 100644
--- a/sql/updates/world/2012_12_01_03_world_ulduar_creature_text.sql
+++ b/sql/old/3.3.5a/2012_12_01_03_world_ulduar_creature_text.sql
diff --git a/sql/updates/world/2012_12_01_04_world_spelldifficulty_dbc.sql b/sql/old/3.3.5a/2012_12_01_04_world_spelldifficulty_dbc.sql
index fe5df812c71..fe5df812c71 100644
--- a/sql/updates/world/2012_12_01_04_world_spelldifficulty_dbc.sql
+++ b/sql/old/3.3.5a/2012_12_01_04_world_spelldifficulty_dbc.sql
diff --git a/sql/updates/world/2012_12_01_05_world_creature_template.sql b/sql/old/3.3.5a/2012_12_01_05_world_creature_template.sql
index aa2c6ebb898..aa2c6ebb898 100644
--- a/sql/updates/world/2012_12_01_05_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_12_01_05_world_creature_template.sql
diff --git a/sql/updates/world/2012_12_02_00_world_game_object.sql b/sql/old/3.3.5a/2012_12_02_00_world_game_object.sql
index 3205159a703..3205159a703 100644
--- a/sql/updates/world/2012_12_02_00_world_game_object.sql
+++ b/sql/old/3.3.5a/2012_12_02_00_world_game_object.sql
diff --git a/sql/updates/world/2012_12_02_01_world_creature_text.sql b/sql/old/3.3.5a/2012_12_02_01_world_creature_text.sql
index bd98fc8527c..bd98fc8527c 100644
--- a/sql/updates/world/2012_12_02_01_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_12_02_01_world_creature_text.sql
diff --git a/sql/updates/world/2012_12_02_02_world_waypoint_data.sql b/sql/old/3.3.5a/2012_12_02_02_world_waypoint_data.sql
index 6413ad00b62..6413ad00b62 100644
--- a/sql/updates/world/2012_12_02_02_world_waypoint_data.sql
+++ b/sql/old/3.3.5a/2012_12_02_02_world_waypoint_data.sql
diff --git a/sql/updates/characters/2012_12_03_00_character_character_queststatus_monthly.sql b/sql/old/3.3.5a/2012_12_03_00_character_character_queststatus_monthly.sql
index 256bb1f7ad6..256bb1f7ad6 100644
--- a/sql/updates/characters/2012_12_03_00_character_character_queststatus_monthly.sql
+++ b/sql/old/3.3.5a/2012_12_03_00_character_character_queststatus_monthly.sql
diff --git a/sql/updates/world/2012_12_04_00_world_creature_text.sql b/sql/old/3.3.5a/2012_12_04_00_world_creature_text.sql
index 654ed11de4f..654ed11de4f 100644
--- a/sql/updates/world/2012_12_04_00_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_12_04_00_world_creature_text.sql
diff --git a/sql/updates/world/2012_12_04_01_world_quest_start_scripts.sql b/sql/old/3.3.5a/2012_12_04_01_world_quest_start_scripts.sql
index f2ac40c7880..f2ac40c7880 100644
--- a/sql/updates/world/2012_12_04_01_world_quest_start_scripts.sql
+++ b/sql/old/3.3.5a/2012_12_04_01_world_quest_start_scripts.sql
diff --git a/sql/updates/world/2012_12_04_02_world_reputation_reward_rate.sql b/sql/old/3.3.5a/2012_12_04_02_world_reputation_reward_rate.sql
index a6b58583532..a6b58583532 100644
--- a/sql/updates/world/2012_12_04_02_world_reputation_reward_rate.sql
+++ b/sql/old/3.3.5a/2012_12_04_02_world_reputation_reward_rate.sql
diff --git a/sql/updates/world/2012_12_04_03_world_reputation_reward_rate.sql b/sql/old/3.3.5a/2012_12_04_03_world_reputation_reward_rate.sql
index 9f8341ea464..9f8341ea464 100644
--- a/sql/updates/world/2012_12_04_03_world_reputation_reward_rate.sql
+++ b/sql/old/3.3.5a/2012_12_04_03_world_reputation_reward_rate.sql
diff --git a/sql/updates/world/2012_12_04_04_world_creature_text.sql b/sql/old/3.3.5a/2012_12_04_04_world_creature_text.sql
index 1cf52a1417f..1cf52a1417f 100644
--- a/sql/updates/world/2012_12_04_04_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_12_04_04_world_creature_text.sql
diff --git a/sql/updates/world/2012_12_04_05_world_spell_script_names.sql b/sql/old/3.3.5a/2012_12_04_05_world_spell_script_names.sql
index f325ac731d4..f325ac731d4 100644
--- a/sql/updates/world/2012_12_04_05_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_12_04_05_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_12_04_06_world_spell_creature_text.sql b/sql/old/3.3.5a/2012_12_04_06_world_spell_creature_text.sql
index 04f10fa494f..04f10fa494f 100644
--- a/sql/updates/world/2012_12_04_06_world_spell_creature_text.sql
+++ b/sql/old/3.3.5a/2012_12_04_06_world_spell_creature_text.sql
diff --git a/sql/updates/world/2012_12_05_00_world_creature_text.sql b/sql/old/3.3.5a/2012_12_05_00_world_creature_text.sql
index b3b382e46e2..b3b382e46e2 100644
--- a/sql/updates/world/2012_12_05_00_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_12_05_00_world_creature_text.sql
diff --git a/sql/updates/world/2012_12_06_00_world_creature_text.sql b/sql/old/3.3.5a/2012_12_06_00_world_creature_text.sql
index c0fec8e041e..c0fec8e041e 100644
--- a/sql/updates/world/2012_12_06_00_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_12_06_00_world_creature_text.sql
diff --git a/sql/updates/world/2012_12_07_00_world_creature_text.sql b/sql/old/3.3.5a/2012_12_07_00_world_creature_text.sql
index 6763834d668..6763834d668 100644
--- a/sql/updates/world/2012_12_07_00_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_12_07_00_world_creature_text.sql
diff --git a/sql/updates/world/2012_12_07_00_world_script_texts.sql b/sql/old/3.3.5a/2012_12_07_00_world_script_texts.sql
index b1362aac796..b1362aac796 100644
--- a/sql/updates/world/2012_12_07_00_world_script_texts.sql
+++ b/sql/old/3.3.5a/2012_12_07_00_world_script_texts.sql
diff --git a/sql/updates/world/2012_12_07_01_world_misc.sql b/sql/old/3.3.5a/2012_12_07_01_world_misc.sql
index aaee366bfce..aaee366bfce 100644
--- a/sql/updates/world/2012_12_07_01_world_misc.sql
+++ b/sql/old/3.3.5a/2012_12_07_01_world_misc.sql
diff --git a/sql/updates/world/2012_12_07_02_world_tracker_pitcrawler.sql b/sql/old/3.3.5a/2012_12_07_02_world_tracker_pitcrawler.sql
index 345a61cb7f5..345a61cb7f5 100644
--- a/sql/updates/world/2012_12_07_02_world_tracker_pitcrawler.sql
+++ b/sql/old/3.3.5a/2012_12_07_02_world_tracker_pitcrawler.sql
diff --git a/sql/updates/world/2012_12_07_03_world_tracker_trista.sql b/sql/old/3.3.5a/2012_12_07_03_world_tracker_trista.sql
index b717f4e53e8..b717f4e53e8 100644
--- a/sql/updates/world/2012_12_07_03_world_tracker_trista.sql
+++ b/sql/old/3.3.5a/2012_12_07_03_world_tracker_trista.sql
diff --git a/sql/updates/world/2012_12_07_04_world_misc.sql b/sql/old/3.3.5a/2012_12_07_04_world_misc.sql
index fb4c466d91c..fb4c466d91c 100644
--- a/sql/updates/world/2012_12_07_04_world_misc.sql
+++ b/sql/old/3.3.5a/2012_12_07_04_world_misc.sql
diff --git a/sql/updates/world/2012_12_07_05_world_creature_text.sql b/sql/old/3.3.5a/2012_12_07_05_world_creature_text.sql
index 8e3e2cd737f..8e3e2cd737f 100644
--- a/sql/updates/world/2012_12_07_05_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_12_07_05_world_creature_text.sql
diff --git a/sql/updates/world/2012_12_07_06_world_sai.sql b/sql/old/3.3.5a/2012_12_07_06_world_sai.sql
index d0d1be35766..d0d1be35766 100644
--- a/sql/updates/world/2012_12_07_06_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_07_06_world_sai.sql
diff --git a/sql/updates/world/2012_12_07_07_world_sai.sql b/sql/old/3.3.5a/2012_12_07_07_world_sai.sql
index d9acb9c310c..d9acb9c310c 100644
--- a/sql/updates/world/2012_12_07_07_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_07_07_world_sai.sql
diff --git a/sql/updates/world/2012_12_07_08_world_misc.sql b/sql/old/3.3.5a/2012_12_07_08_world_misc.sql
index a696ba401cc..a696ba401cc 100644
--- a/sql/updates/world/2012_12_07_08_world_misc.sql
+++ b/sql/old/3.3.5a/2012_12_07_08_world_misc.sql
diff --git a/sql/updates/world/2012_12_07_09_world_db_script_string.sql b/sql/old/3.3.5a/2012_12_07_09_world_db_script_string.sql
index 4880b84dff0..4880b84dff0 100644
--- a/sql/updates/world/2012_12_07_09_world_db_script_string.sql
+++ b/sql/old/3.3.5a/2012_12_07_09_world_db_script_string.sql
diff --git a/sql/updates/world/2012_12_08_00_world_creature_text.sql b/sql/old/3.3.5a/2012_12_08_00_world_creature_text.sql
index 5a5cd579e2b..5a5cd579e2b 100644
--- a/sql/updates/world/2012_12_08_00_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_12_08_00_world_creature_text.sql
diff --git a/sql/updates/world/2012_12_08_01_world_sai.sql b/sql/old/3.3.5a/2012_12_08_01_world_sai.sql
index 2880b01d07a..2880b01d07a 100644
--- a/sql/updates/world/2012_12_08_01_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_08_01_world_sai.sql
diff --git a/sql/updates/world/2012_12_09_00_world_conditions.sql b/sql/old/3.3.5a/2012_12_09_00_world_conditions.sql
index dbb3dac7fc3..dbb3dac7fc3 100644
--- a/sql/updates/world/2012_12_09_00_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_12_09_00_world_conditions.sql
diff --git a/sql/updates/world/2012_12_09_00_world_creature_text.sql b/sql/old/3.3.5a/2012_12_09_00_world_creature_text.sql
index 6d850191938..6d850191938 100644
--- a/sql/updates/world/2012_12_09_00_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_12_09_00_world_creature_text.sql
diff --git a/sql/updates/world/2012_12_09_01_world_misc.sql b/sql/old/3.3.5a/2012_12_09_01_world_misc.sql
index 7c8bdfbb1c5..7c8bdfbb1c5 100644
--- a/sql/updates/world/2012_12_09_01_world_misc.sql
+++ b/sql/old/3.3.5a/2012_12_09_01_world_misc.sql
diff --git a/sql/updates/world/2012_12_09_02_world_quest_template.sql b/sql/old/3.3.5a/2012_12_09_02_world_quest_template.sql
index 52d0202d2a1..52d0202d2a1 100644
--- a/sql/updates/world/2012_12_09_02_world_quest_template.sql
+++ b/sql/old/3.3.5a/2012_12_09_02_world_quest_template.sql
diff --git a/sql/updates/world/2012_12_10_00_world_smart_scripts.sql b/sql/old/3.3.5a/2012_12_10_00_world_smart_scripts.sql
index ed0ee9bf764..ed0ee9bf764 100644
--- a/sql/updates/world/2012_12_10_00_world_smart_scripts.sql
+++ b/sql/old/3.3.5a/2012_12_10_00_world_smart_scripts.sql
diff --git a/sql/updates/world/2012_12_10_01_world_spell_script_names.sql b/sql/old/3.3.5a/2012_12_10_01_world_spell_script_names.sql
index bc3684011e8..bc3684011e8 100644
--- a/sql/updates/world/2012_12_10_01_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_12_10_01_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_12_10_02_world_spawns_waypoints.sql b/sql/old/3.3.5a/2012_12_10_02_world_spawns_waypoints.sql
index 68613f3aaa9..68613f3aaa9 100644
--- a/sql/updates/world/2012_12_10_02_world_spawns_waypoints.sql
+++ b/sql/old/3.3.5a/2012_12_10_02_world_spawns_waypoints.sql
diff --git a/sql/updates/world/2012_12_13_00_world.sql b/sql/old/3.3.5a/2012_12_13_00_world.sql
index ab27796f933..ab27796f933 100644
--- a/sql/updates/world/2012_12_13_00_world.sql
+++ b/sql/old/3.3.5a/2012_12_13_00_world.sql
diff --git a/sql/updates/world/2012_12_14_00_world_conditions.sql b/sql/old/3.3.5a/2012_12_14_00_world_conditions.sql
index 6b6fbfd02c0..6b6fbfd02c0 100644
--- a/sql/updates/world/2012_12_14_00_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_12_14_00_world_conditions.sql
diff --git a/sql/updates/world/2012_12_14_01_world_waypoint_data.sql b/sql/old/3.3.5a/2012_12_14_01_world_waypoint_data.sql
index e3589c53340..e3589c53340 100644
--- a/sql/updates/world/2012_12_14_01_world_waypoint_data.sql
+++ b/sql/old/3.3.5a/2012_12_14_01_world_waypoint_data.sql
diff --git a/sql/updates/world/2012_12_14_02_world_misc.sql b/sql/old/3.3.5a/2012_12_14_02_world_misc.sql
index 29aa47909e1..29aa47909e1 100644
--- a/sql/updates/world/2012_12_14_02_world_misc.sql
+++ b/sql/old/3.3.5a/2012_12_14_02_world_misc.sql
diff --git a/sql/updates/world/2012_12_14_03_world_npc_spellclick_spells.sql b/sql/old/3.3.5a/2012_12_14_03_world_npc_spellclick_spells.sql
index 2669abbc562..2669abbc562 100644
--- a/sql/updates/world/2012_12_14_03_world_npc_spellclick_spells.sql
+++ b/sql/old/3.3.5a/2012_12_14_03_world_npc_spellclick_spells.sql
diff --git a/sql/updates/world/2012_12_14_04_world_misc.sql b/sql/old/3.3.5a/2012_12_14_04_world_misc.sql
index 2cd99cfb12a..2cd99cfb12a 100644
--- a/sql/updates/world/2012_12_14_04_world_misc.sql
+++ b/sql/old/3.3.5a/2012_12_14_04_world_misc.sql
diff --git a/sql/updates/world/2012_12_14_05_world_spell_script_names.sql b/sql/old/3.3.5a/2012_12_14_05_world_spell_script_names.sql
index 6d6ab651365..6d6ab651365 100644
--- a/sql/updates/world/2012_12_14_05_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2012_12_14_05_world_spell_script_names.sql
diff --git a/sql/updates/world/2012_12_15_00_world_waypoint_data.sql b/sql/old/3.3.5a/2012_12_15_00_world_waypoint_data.sql
index c63180ebe5e..c63180ebe5e 100644
--- a/sql/updates/world/2012_12_15_00_world_waypoint_data.sql
+++ b/sql/old/3.3.5a/2012_12_15_00_world_waypoint_data.sql
diff --git a/sql/updates/world/2012_12_15_01_world_sai.sql b/sql/old/3.3.5a/2012_12_15_01_world_sai.sql
index 6d43bedc446..6d43bedc446 100644
--- a/sql/updates/world/2012_12_15_01_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_15_01_world_sai.sql
diff --git a/sql/updates/world/2012_12_15_02_world_sai.sql b/sql/old/3.3.5a/2012_12_15_02_world_sai.sql
index bf092bfb88d..bf092bfb88d 100644
--- a/sql/updates/world/2012_12_15_02_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_15_02_world_sai.sql
diff --git a/sql/updates/world/2012_12_15_03_world_quest_end_scripts.sql b/sql/old/3.3.5a/2012_12_15_03_world_quest_end_scripts.sql
index 91838bda93d..91838bda93d 100644
--- a/sql/updates/world/2012_12_15_03_world_quest_end_scripts.sql
+++ b/sql/old/3.3.5a/2012_12_15_03_world_quest_end_scripts.sql
diff --git a/sql/updates/world/2012_12_16_00_world_creature_addon.sql b/sql/old/3.3.5a/2012_12_16_00_world_creature_addon.sql
index a79bb407321..a79bb407321 100644
--- a/sql/updates/world/2012_12_16_00_world_creature_addon.sql
+++ b/sql/old/3.3.5a/2012_12_16_00_world_creature_addon.sql
diff --git a/sql/updates/world/2012_12_16_01_world_npc_vendor.sql b/sql/old/3.3.5a/2012_12_16_01_world_npc_vendor.sql
index 0e5ed38c88d..0e5ed38c88d 100644
--- a/sql/updates/world/2012_12_16_01_world_npc_vendor.sql
+++ b/sql/old/3.3.5a/2012_12_16_01_world_npc_vendor.sql
diff --git a/sql/updates/world/2012_12_16_02_world_creature_text.sql b/sql/old/3.3.5a/2012_12_16_02_world_creature_text.sql
index f2d605469f8..f2d605469f8 100644
--- a/sql/updates/world/2012_12_16_02_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_12_16_02_world_creature_text.sql
diff --git a/sql/updates/world/2012_12_16_03_world_sai.sql b/sql/old/3.3.5a/2012_12_16_03_world_sai.sql
index 40b1e32dbeb..40b1e32dbeb 100644
--- a/sql/updates/world/2012_12_16_03_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_16_03_world_sai.sql
diff --git a/sql/updates/world/2012_12_17_00_world_creature_template.sql b/sql/old/3.3.5a/2012_12_17_00_world_creature_template.sql
index dfe9132e7a6..dfe9132e7a6 100644
--- a/sql/updates/world/2012_12_17_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2012_12_17_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_12_17_00_world_song_of_wind_and_water.sql b/sql/old/3.3.5a/2012_12_17_00_world_song_of_wind_and_water.sql
index 52c80334c0c..52c80334c0c 100644
--- a/sql/updates/world/2012_12_17_00_world_song_of_wind_and_water.sql
+++ b/sql/old/3.3.5a/2012_12_17_00_world_song_of_wind_and_water.sql
diff --git a/sql/updates/world/2012_12_17_00_world_spell_linked_spell.sql b/sql/old/3.3.5a/2012_12_17_00_world_spell_linked_spell.sql
index a2cfc7073d0..a2cfc7073d0 100644
--- a/sql/updates/world/2012_12_17_00_world_spell_linked_spell.sql
+++ b/sql/old/3.3.5a/2012_12_17_00_world_spell_linked_spell.sql
diff --git a/sql/updates/characters/2012_12_18_00_character_worldstates.sql b/sql/old/3.3.5a/2012_12_18_00_character_worldstates.sql
index c6fc15e60b7..c6fc15e60b7 100644
--- a/sql/updates/characters/2012_12_18_00_character_worldstates.sql
+++ b/sql/old/3.3.5a/2012_12_18_00_character_worldstates.sql
diff --git a/sql/updates/world/2012_12_18_00_world_creature_text.sql b/sql/old/3.3.5a/2012_12_18_00_world_creature_text.sql
index 1cf9211343f..1cf9211343f 100644
--- a/sql/updates/world/2012_12_18_00_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_12_18_00_world_creature_text.sql
diff --git a/sql/updates/world/2012_12_18_00_world_waking_the_sleeper.sql b/sql/old/3.3.5a/2012_12_18_00_world_waking_the_sleeper.sql
index 4f8a203100d..4f8a203100d 100644
--- a/sql/updates/world/2012_12_18_00_world_waking_the_sleeper.sql
+++ b/sql/old/3.3.5a/2012_12_18_00_world_waking_the_sleeper.sql
diff --git a/sql/updates/world/2012_12_18_01_world_creature_text.sql b/sql/old/3.3.5a/2012_12_18_01_world_creature_text.sql
index 24779f67fc7..24779f67fc7 100644
--- a/sql/updates/world/2012_12_18_01_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_12_18_01_world_creature_text.sql
diff --git a/sql/updates/world/2012_12_18_02_world_misc.sql b/sql/old/3.3.5a/2012_12_18_02_world_misc.sql
index 5df6ef8eb95..5df6ef8eb95 100644
--- a/sql/updates/world/2012_12_18_02_world_misc.sql
+++ b/sql/old/3.3.5a/2012_12_18_02_world_misc.sql
diff --git a/sql/updates/world/2012_12_18_02_world_sai.sql b/sql/old/3.3.5a/2012_12_18_02_world_sai.sql
index 0843285550f..0843285550f 100644
--- a/sql/updates/world/2012_12_18_02_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_18_02_world_sai.sql
diff --git a/sql/updates/world/2012_12_19_00_world_sai.sql b/sql/old/3.3.5a/2012_12_19_00_world_sai.sql
index e11891cdfbd..e11891cdfbd 100644
--- a/sql/updates/world/2012_12_19_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_19_00_world_sai.sql
diff --git a/sql/updates/world/2012_12_19_01_world_viscidus.sql b/sql/old/3.3.5a/2012_12_19_01_world_viscidus.sql
index 16d33b80b8f..16d33b80b8f 100644
--- a/sql/updates/world/2012_12_19_01_world_viscidus.sql
+++ b/sql/old/3.3.5a/2012_12_19_01_world_viscidus.sql
diff --git a/sql/updates/world/2012_12_19_02_world_sai.sql b/sql/old/3.3.5a/2012_12_19_02_world_sai.sql
index c6367e1a8ca..c6367e1a8ca 100644
--- a/sql/updates/world/2012_12_19_02_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_19_02_world_sai.sql
diff --git a/sql/updates/characters/2012_12_20_00_characters_create_item_loot.sql b/sql/old/3.3.5a/2012_12_20_00_characters_create_item_loot.sql
index 3c1529e8bdf..3c1529e8bdf 100644
--- a/sql/updates/characters/2012_12_20_00_characters_create_item_loot.sql
+++ b/sql/old/3.3.5a/2012_12_20_00_characters_create_item_loot.sql
diff --git a/sql/updates/world/2012_12_20_00_world_conditions.sql b/sql/old/3.3.5a/2012_12_20_00_world_conditions.sql
index 53fc5733e53..53fc5733e53 100644
--- a/sql/updates/world/2012_12_20_00_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_12_20_00_world_conditions.sql
diff --git a/sql/updates/world/2012_12_20_01_world_conditions.sql b/sql/old/3.3.5a/2012_12_20_01_world_conditions.sql
index 9d1851305a3..9d1851305a3 100644
--- a/sql/updates/world/2012_12_20_01_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_12_20_01_world_conditions.sql
diff --git a/sql/updates/world/2012_12_20_02_world_misc.sql b/sql/old/3.3.5a/2012_12_20_02_world_misc.sql
index c04965d8258..c04965d8258 100644
--- a/sql/updates/world/2012_12_20_02_world_misc.sql
+++ b/sql/old/3.3.5a/2012_12_20_02_world_misc.sql
diff --git a/sql/updates/world/2012_12_20_03_world_conditions.sql b/sql/old/3.3.5a/2012_12_20_03_world_conditions.sql
index f07b18ed2e4..f07b18ed2e4 100644
--- a/sql/updates/world/2012_12_20_03_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_12_20_03_world_conditions.sql
diff --git a/sql/updates/world/2012_12_21_00_world_conditions.sql b/sql/old/3.3.5a/2012_12_21_00_world_conditions.sql
index eddf541eaf3..eddf541eaf3 100644
--- a/sql/updates/world/2012_12_21_00_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_12_21_00_world_conditions.sql
diff --git a/sql/updates/world/2012_12_21_01_world_conditions.sql b/sql/old/3.3.5a/2012_12_21_01_world_conditions.sql
index fdc5becd963..fdc5becd963 100644
--- a/sql/updates/world/2012_12_21_01_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_12_21_01_world_conditions.sql
diff --git a/sql/updates/world/2012_12_22_01_world_sai.sql b/sql/old/3.3.5a/2012_12_22_01_world_sai.sql
index e2a61426679..e2a61426679 100644
--- a/sql/updates/world/2012_12_22_01_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_22_01_world_sai.sql
diff --git a/sql/updates/world/2012_12_22_02_world_the_crusaders_pinnacle.sql b/sql/old/3.3.5a/2012_12_22_02_world_the_crusaders_pinnacle.sql
index 5debd41a160..5debd41a160 100644
--- a/sql/updates/world/2012_12_22_02_world_the_crusaders_pinnacle.sql
+++ b/sql/old/3.3.5a/2012_12_22_02_world_the_crusaders_pinnacle.sql
diff --git a/sql/updates/world/2012_12_23_00_world_creature_text.sql b/sql/old/3.3.5a/2012_12_23_00_world_creature_text.sql
index 37b4d66b3fe..37b4d66b3fe 100644
--- a/sql/updates/world/2012_12_23_00_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_12_23_00_world_creature_text.sql
diff --git a/sql/updates/world/2012_12_23_01_world_creature_text.sql b/sql/old/3.3.5a/2012_12_23_01_world_creature_text.sql
index b663c5269e9..b663c5269e9 100644
--- a/sql/updates/world/2012_12_23_01_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_12_23_01_world_creature_text.sql
diff --git a/sql/updates/world/2012_12_23_02_world_trinity_string.sql b/sql/old/3.3.5a/2012_12_23_02_world_trinity_string.sql
index ac99945d5a5..ac99945d5a5 100644
--- a/sql/updates/world/2012_12_23_02_world_trinity_string.sql
+++ b/sql/old/3.3.5a/2012_12_23_02_world_trinity_string.sql
diff --git a/sql/updates/world/2012_12_23_03_world_misc.sql b/sql/old/3.3.5a/2012_12_23_03_world_misc.sql
index c9a42df10dd..c9a42df10dd 100644
--- a/sql/updates/world/2012_12_23_03_world_misc.sql
+++ b/sql/old/3.3.5a/2012_12_23_03_world_misc.sql
diff --git a/sql/updates/world/2012_12_24_00_world_defending_wyrmrest_temple.sql b/sql/old/3.3.5a/2012_12_24_00_world_defending_wyrmrest_temple.sql
index edf1f887d1c..edf1f887d1c 100644
--- a/sql/updates/world/2012_12_24_00_world_defending_wyrmrest_temple.sql
+++ b/sql/old/3.3.5a/2012_12_24_00_world_defending_wyrmrest_temple.sql
diff --git a/sql/updates/world/2012_12_24_01_world_sai.sql b/sql/old/3.3.5a/2012_12_24_01_world_sai.sql
index d151ee4aa2c..d151ee4aa2c 100644
--- a/sql/updates/world/2012_12_24_01_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_24_01_world_sai.sql
diff --git a/sql/updates/world/2012_12_24_02_world_sai.sql b/sql/old/3.3.5a/2012_12_24_02_world_sai.sql
index 03d0a9ef5c6..03d0a9ef5c6 100644
--- a/sql/updates/world/2012_12_24_02_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_24_02_world_sai.sql
diff --git a/sql/updates/world/2012_12_24_03_world_sai.sql b/sql/old/3.3.5a/2012_12_24_03_world_sai.sql
index f89f3c968aa..f89f3c968aa 100644
--- a/sql/updates/world/2012_12_24_03_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_24_03_world_sai.sql
diff --git a/sql/updates/world/2012_12_24_04_world_creature.sql b/sql/old/3.3.5a/2012_12_24_04_world_creature.sql
index 42f69d97a9e..42f69d97a9e 100644
--- a/sql/updates/world/2012_12_24_04_world_creature.sql
+++ b/sql/old/3.3.5a/2012_12_24_04_world_creature.sql
diff --git a/sql/updates/world/2012_12_24_05_world_object.sql b/sql/old/3.3.5a/2012_12_24_05_world_object.sql
index 2b9947a6bd5..2b9947a6bd5 100644
--- a/sql/updates/world/2012_12_24_05_world_object.sql
+++ b/sql/old/3.3.5a/2012_12_24_05_world_object.sql
diff --git a/sql/updates/world/2012_12_24_06_world_reputation.sql b/sql/old/3.3.5a/2012_12_24_06_world_reputation.sql
index 9320d76365d..9320d76365d 100644
--- a/sql/updates/world/2012_12_24_06_world_reputation.sql
+++ b/sql/old/3.3.5a/2012_12_24_06_world_reputation.sql
diff --git a/sql/updates/world/2012_12_24_07_world_sai.sql b/sql/old/3.3.5a/2012_12_24_07_world_sai.sql
index 3cce37295fd..3cce37295fd 100644
--- a/sql/updates/world/2012_12_24_07_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_24_07_world_sai.sql
diff --git a/sql/updates/world/2012_12_24_08_world_conditions.sql b/sql/old/3.3.5a/2012_12_24_08_world_conditions.sql
index ad641203453..ad641203453 100644
--- a/sql/updates/world/2012_12_24_08_world_conditions.sql
+++ b/sql/old/3.3.5a/2012_12_24_08_world_conditions.sql
diff --git a/sql/updates/world/2012_12_24_09_world_sai.sql b/sql/old/3.3.5a/2012_12_24_09_world_sai.sql
index d75dd937598..d75dd937598 100644
--- a/sql/updates/world/2012_12_24_09_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_24_09_world_sai.sql
diff --git a/sql/updates/world/2012_12_25_00_world_sai.sql b/sql/old/3.3.5a/2012_12_25_00_world_sai.sql
index 33363d33573..33363d33573 100644
--- a/sql/updates/world/2012_12_25_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_25_00_world_sai.sql
diff --git a/sql/updates/world/2012_12_25_01_world_sai.sql b/sql/old/3.3.5a/2012_12_25_01_world_sai.sql
index cad0ce2aec3..cad0ce2aec3 100644
--- a/sql/updates/world/2012_12_25_01_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_25_01_world_sai.sql
diff --git a/sql/updates/world/2012_12_25_02_world_sai.sql b/sql/old/3.3.5a/2012_12_25_02_world_sai.sql
index 35ac4ebb97b..35ac4ebb97b 100644
--- a/sql/updates/world/2012_12_25_02_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_25_02_world_sai.sql
diff --git a/sql/updates/world/2012_12_25_03_world_sai.sql b/sql/old/3.3.5a/2012_12_25_03_world_sai.sql
index 2a7553aabb3..2a7553aabb3 100644
--- a/sql/updates/world/2012_12_25_03_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_25_03_world_sai.sql
diff --git a/sql/updates/world/2012_12_25_04_world_sai.sql b/sql/old/3.3.5a/2012_12_25_04_world_sai.sql
index 46b2c4c2fd1..46b2c4c2fd1 100644
--- a/sql/updates/world/2012_12_25_04_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_25_04_world_sai.sql
diff --git a/sql/updates/world/2012_12_26_01_world_creature_text.sql b/sql/old/3.3.5a/2012_12_26_01_world_creature_text.sql
index ae4170ae5a8..ae4170ae5a8 100644
--- a/sql/updates/world/2012_12_26_01_world_creature_text.sql
+++ b/sql/old/3.3.5a/2012_12_26_01_world_creature_text.sql
diff --git a/sql/updates/world/2012_12_26_02_world_sai.sql b/sql/old/3.3.5a/2012_12_26_02_world_sai.sql
index b88b4044edb..b88b4044edb 100644
--- a/sql/updates/world/2012_12_26_02_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_26_02_world_sai.sql
diff --git a/sql/updates/world/2012_12_26_03_world_sai.sql b/sql/old/3.3.5a/2012_12_26_03_world_sai.sql
index 2e9ed5090e0..2e9ed5090e0 100644
--- a/sql/updates/world/2012_12_26_03_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_26_03_world_sai.sql
diff --git a/sql/updates/world/2012_12_26_04_world_sai.sql b/sql/old/3.3.5a/2012_12_26_04_world_sai.sql
index a29c8a22fdc..a29c8a22fdc 100644
--- a/sql/updates/world/2012_12_26_04_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_26_04_world_sai.sql
diff --git a/sql/updates/world/2012_12_26_05_world_sai.sql b/sql/old/3.3.5a/2012_12_26_05_world_sai.sql
index 143f1e9bdb0..143f1e9bdb0 100644
--- a/sql/updates/world/2012_12_26_05_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_26_05_world_sai.sql
diff --git a/sql/updates/world/2012_12_26_06_world_sai.sql b/sql/old/3.3.5a/2012_12_26_06_world_sai.sql
index 184282fe907..184282fe907 100644
--- a/sql/updates/world/2012_12_26_06_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_26_06_world_sai.sql
diff --git a/sql/updates/world/2012_12_26_07_world_game_event.sql b/sql/old/3.3.5a/2012_12_26_07_world_game_event.sql
index 21dcf12e1c4..21dcf12e1c4 100644
--- a/sql/updates/world/2012_12_26_07_world_game_event.sql
+++ b/sql/old/3.3.5a/2012_12_26_07_world_game_event.sql
diff --git a/sql/updates/world/2012_12_26_08_world_sai.sql b/sql/old/3.3.5a/2012_12_26_08_world_sai.sql
index 8fde794613e..8fde794613e 100644
--- a/sql/updates/world/2012_12_26_08_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_26_08_world_sai.sql
diff --git a/sql/updates/world/2012_12_26_09_world_sai.sql b/sql/old/3.3.5a/2012_12_26_09_world_sai.sql
index fe81c15fb3a..fe81c15fb3a 100644
--- a/sql/updates/world/2012_12_26_09_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_26_09_world_sai.sql
diff --git a/sql/updates/world/2012_12_26_10_world_sai.sql b/sql/old/3.3.5a/2012_12_26_10_world_sai.sql
index b6b925d8255..b6b925d8255 100644
--- a/sql/updates/world/2012_12_26_10_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_26_10_world_sai.sql
diff --git a/sql/updates/world/2012_12_26_11_world_sai.sql b/sql/old/3.3.5a/2012_12_26_11_world_sai.sql
index abbdfb88c24..abbdfb88c24 100644
--- a/sql/updates/world/2012_12_26_11_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_26_11_world_sai.sql
diff --git a/sql/updates/world/2012_12_26_12_world_quest_end_scripts.sql b/sql/old/3.3.5a/2012_12_26_12_world_quest_end_scripts.sql
index 501bb796557..501bb796557 100644
--- a/sql/updates/world/2012_12_26_12_world_quest_end_scripts.sql
+++ b/sql/old/3.3.5a/2012_12_26_12_world_quest_end_scripts.sql
diff --git a/sql/updates/world/2012_12_26_13_world_sai.sql b/sql/old/3.3.5a/2012_12_26_13_world_sai.sql
index d36affe8eb3..d36affe8eb3 100644
--- a/sql/updates/world/2012_12_26_13_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_26_13_world_sai.sql
diff --git a/sql/updates/world/2012_12_26_14_world_sai.sql b/sql/old/3.3.5a/2012_12_26_14_world_sai.sql
index 2929d590637..2929d590637 100644
--- a/sql/updates/world/2012_12_26_14_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_26_14_world_sai.sql
diff --git a/sql/updates/world/2012_12_26_15_world_sai.sql b/sql/old/3.3.5a/2012_12_26_15_world_sai.sql
index a40f73bffc8..a40f73bffc8 100644
--- a/sql/updates/world/2012_12_26_15_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_26_15_world_sai.sql
diff --git a/sql/updates/world/2012_12_26_16_world_sai.sql b/sql/old/3.3.5a/2012_12_26_16_world_sai.sql
index 39a246c9ccd..39a246c9ccd 100644
--- a/sql/updates/world/2012_12_26_16_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_26_16_world_sai.sql
diff --git a/sql/updates/world/2012_12_26_17_world_sai.sql b/sql/old/3.3.5a/2012_12_26_17_world_sai.sql
index 6f35bcc230b..6f35bcc230b 100644
--- a/sql/updates/world/2012_12_26_17_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_26_17_world_sai.sql
diff --git a/sql/updates/world/2012_12_26_18_world_sai.sql b/sql/old/3.3.5a/2012_12_26_18_world_sai.sql
index cd4989de5e0..cd4989de5e0 100644
--- a/sql/updates/world/2012_12_26_18_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_26_18_world_sai.sql
diff --git a/sql/updates/world/2012_12_26_19_world_sai.sql b/sql/old/3.3.5a/2012_12_26_19_world_sai.sql
index 5cfd2a29c62..5cfd2a29c62 100644
--- a/sql/updates/world/2012_12_26_19_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_26_19_world_sai.sql
diff --git a/sql/updates/world/2012_12_26_20_world_sai.sql b/sql/old/3.3.5a/2012_12_26_20_world_sai.sql
index 3574835ce32..3574835ce32 100644
--- a/sql/updates/world/2012_12_26_20_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_26_20_world_sai.sql
diff --git a/sql/updates/world/2012_12_27_00_world_orgrims_hammer.sql b/sql/old/3.3.5a/2012_12_27_00_world_orgrims_hammer.sql
index a7c8af76fa0..a7c8af76fa0 100644
--- a/sql/updates/world/2012_12_27_00_world_orgrims_hammer.sql
+++ b/sql/old/3.3.5a/2012_12_27_00_world_orgrims_hammer.sql
diff --git a/sql/updates/world/2012_12_27_01_world_locales_quest.sql b/sql/old/3.3.5a/2012_12_27_01_world_locales_quest.sql
index 047f8bb499f..047f8bb499f 100644
--- a/sql/updates/world/2012_12_27_01_world_locales_quest.sql
+++ b/sql/old/3.3.5a/2012_12_27_01_world_locales_quest.sql
diff --git a/sql/updates/world/2012_12_27_02_world_locales.sql b/sql/old/3.3.5a/2012_12_27_02_world_locales.sql
index 5caeb009447..5caeb009447 100644
--- a/sql/updates/world/2012_12_27_02_world_locales.sql
+++ b/sql/old/3.3.5a/2012_12_27_02_world_locales.sql
diff --git a/sql/updates/world/2012_12_27_03_world_sai.sql b/sql/old/3.3.5a/2012_12_27_03_world_sai.sql
index acd5c931c50..acd5c931c50 100644
--- a/sql/updates/world/2012_12_27_03_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_27_03_world_sai.sql
diff --git a/sql/updates/world/2012_12_27_04_world_the_shadows_vault.sql b/sql/old/3.3.5a/2012_12_27_04_world_the_shadows_vault.sql
index 96d176d6d1b..96d176d6d1b 100644
--- a/sql/updates/world/2012_12_27_04_world_the_shadows_vault.sql
+++ b/sql/old/3.3.5a/2012_12_27_04_world_the_shadows_vault.sql
diff --git a/sql/updates/world/2012_12_28_00_world_command.sql b/sql/old/3.3.5a/2012_12_28_00_world_command.sql
index 6de970d3b81..6de970d3b81 100644
--- a/sql/updates/world/2012_12_28_00_world_command.sql
+++ b/sql/old/3.3.5a/2012_12_28_00_world_command.sql
diff --git a/sql/updates/world/2012_12_28_01_world_misc.sql b/sql/old/3.3.5a/2012_12_28_01_world_misc.sql
index 44501390d9e..44501390d9e 100644
--- a/sql/updates/world/2012_12_28_01_world_misc.sql
+++ b/sql/old/3.3.5a/2012_12_28_01_world_misc.sql
diff --git a/sql/updates/world/2012_12_28_02_world_sai.sql b/sql/old/3.3.5a/2012_12_28_02_world_sai.sql
index 7a518449fde..7a518449fde 100644
--- a/sql/updates/world/2012_12_28_02_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_28_02_world_sai.sql
diff --git a/sql/updates/world/2012_12_28_03_world_disables.sql b/sql/old/3.3.5a/2012_12_28_03_world_disables.sql
index 017e3aea8c1..017e3aea8c1 100644
--- a/sql/updates/world/2012_12_28_03_world_disables.sql
+++ b/sql/old/3.3.5a/2012_12_28_03_world_disables.sql
diff --git a/sql/updates/world/2012_12_28_04_world_citadel_footsteps.sql b/sql/old/3.3.5a/2012_12_28_04_world_citadel_footsteps.sql
index 3d0ad779dc2..3d0ad779dc2 100644
--- a/sql/updates/world/2012_12_28_04_world_citadel_footsteps.sql
+++ b/sql/old/3.3.5a/2012_12_28_04_world_citadel_footsteps.sql
diff --git a/sql/updates/world/2012_12_30_01_world_trinity_string.sql b/sql/old/3.3.5a/2012_12_30_01_world_trinity_string.sql
index ce0578168f4..ce0578168f4 100644
--- a/sql/updates/world/2012_12_30_01_world_trinity_string.sql
+++ b/sql/old/3.3.5a/2012_12_30_01_world_trinity_string.sql
diff --git a/sql/updates/world/2012_12_31_00_world_sai.sql b/sql/old/3.3.5a/2012_12_31_00_world_sai.sql
index 9e30c29f784..9e30c29f784 100644
--- a/sql/updates/world/2012_12_31_00_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_31_00_world_sai.sql
diff --git a/sql/updates/world/2012_12_31_01_world_sai.sql b/sql/old/3.3.5a/2012_12_31_01_world_sai.sql
index 96cf4d1e724..96cf4d1e724 100644
--- a/sql/updates/world/2012_12_31_01_world_sai.sql
+++ b/sql/old/3.3.5a/2012_12_31_01_world_sai.sql
diff --git a/sql/updates/world/2013_01_01_00_item_template_restore.sql b/sql/old/3.3.5a/2013_01_01_00_item_template_restore.sql
index dc18ff71fe8..dc18ff71fe8 100644
--- a/sql/updates/world/2013_01_01_00_item_template_restore.sql
+++ b/sql/old/3.3.5a/2013_01_01_00_item_template_restore.sql
diff --git a/sql/updates/world/2013_01_01_01_world_creature_text.sql b/sql/old/3.3.5a/2013_01_01_01_world_creature_text.sql
index c0055f8e1d0..c0055f8e1d0 100644
--- a/sql/updates/world/2013_01_01_01_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_01_01_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_02_00_world_misc.sql b/sql/old/3.3.5a/2013_01_02_00_world_misc.sql
index 8527b8ab145..8527b8ab145 100644
--- a/sql/updates/world/2013_01_02_00_world_misc.sql
+++ b/sql/old/3.3.5a/2013_01_02_00_world_misc.sql
diff --git a/sql/updates/world/2013_01_02_01_world_spell_script.sql b/sql/old/3.3.5a/2013_01_02_01_world_spell_script.sql
index a839ca6dc7b..a839ca6dc7b 100644
--- a/sql/updates/world/2013_01_02_01_world_spell_script.sql
+++ b/sql/old/3.3.5a/2013_01_02_01_world_spell_script.sql
diff --git a/sql/updates/world/2013_01_02_02_world_instance_template.sql b/sql/old/3.3.5a/2013_01_02_02_world_instance_template.sql
index f63a2c3ba2e..f63a2c3ba2e 100644
--- a/sql/updates/world/2013_01_02_02_world_instance_template.sql
+++ b/sql/old/3.3.5a/2013_01_02_02_world_instance_template.sql
diff --git a/sql/updates/world/2013_01_02_03_world_sai.sql b/sql/old/3.3.5a/2013_01_02_03_world_sai.sql
index 6f6318b55bd..6f6318b55bd 100644
--- a/sql/updates/world/2013_01_02_03_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_02_03_world_sai.sql
diff --git a/sql/updates/world/2013_01_02_04_world_creature.sql b/sql/old/3.3.5a/2013_01_02_04_world_creature.sql
index 686909ce57e..686909ce57e 100644
--- a/sql/updates/world/2013_01_02_04_world_creature.sql
+++ b/sql/old/3.3.5a/2013_01_02_04_world_creature.sql
diff --git a/sql/updates/world/2013_01_02_05_eye_of_eternity.sql b/sql/old/3.3.5a/2013_01_02_05_eye_of_eternity.sql
index 89cc8f08cce..89cc8f08cce 100644
--- a/sql/updates/world/2013_01_02_05_eye_of_eternity.sql
+++ b/sql/old/3.3.5a/2013_01_02_05_eye_of_eternity.sql
diff --git a/sql/updates/world/2013_01_02_06_world_sai.sql b/sql/old/3.3.5a/2013_01_02_06_world_sai.sql
index 2ce089188d6..2ce089188d6 100644
--- a/sql/updates/world/2013_01_02_06_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_02_06_world_sai.sql
diff --git a/sql/updates/world/2013_01_02_06_world_waypoints.sql b/sql/old/3.3.5a/2013_01_02_06_world_waypoints.sql
index c7302a457a2..c7302a457a2 100644
--- a/sql/updates/world/2013_01_02_06_world_waypoints.sql
+++ b/sql/old/3.3.5a/2013_01_02_06_world_waypoints.sql
diff --git a/sql/updates/world/2013_01_02_07_world_waypoints.sql b/sql/old/3.3.5a/2013_01_02_07_world_waypoints.sql
index b49fd0b28a6..b49fd0b28a6 100644
--- a/sql/updates/world/2013_01_02_07_world_waypoints.sql
+++ b/sql/old/3.3.5a/2013_01_02_07_world_waypoints.sql
diff --git a/sql/updates/world/2013_01_02_08_world_sai.sql b/sql/old/3.3.5a/2013_01_02_08_world_sai.sql
index a3f0dde4658..a3f0dde4658 100644
--- a/sql/updates/world/2013_01_02_08_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_02_08_world_sai.sql
diff --git a/sql/updates/world/2013_01_02_09_world_waypoints.sql b/sql/old/3.3.5a/2013_01_02_09_world_waypoints.sql
index 1c2492fcce8..1c2492fcce8 100644
--- a/sql/updates/world/2013_01_02_09_world_waypoints.sql
+++ b/sql/old/3.3.5a/2013_01_02_09_world_waypoints.sql
diff --git a/sql/updates/world/2013_01_02_10_world_sai.sql b/sql/old/3.3.5a/2013_01_02_10_world_sai.sql
index 0be2c5c2d6b..0be2c5c2d6b 100644
--- a/sql/updates/world/2013_01_02_10_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_02_10_world_sai.sql
diff --git a/sql/updates/world/2013_01_02_11_world_sai.sql b/sql/old/3.3.5a/2013_01_02_11_world_sai.sql
index 7496a765470..7496a765470 100644
--- a/sql/updates/world/2013_01_02_11_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_02_11_world_sai.sql
diff --git a/sql/updates/world/2013_01_02_12_world_go_script.sql b/sql/old/3.3.5a/2013_01_02_12_world_go_script.sql
index aea0a67c47e..aea0a67c47e 100644
--- a/sql/updates/world/2013_01_02_12_world_go_script.sql
+++ b/sql/old/3.3.5a/2013_01_02_12_world_go_script.sql
diff --git a/sql/updates/world/2013_01_02_12_world_waypoints.sql b/sql/old/3.3.5a/2013_01_02_12_world_waypoints.sql
index 6ec7875d8ef..6ec7875d8ef 100644
--- a/sql/updates/world/2013_01_02_12_world_waypoints.sql
+++ b/sql/old/3.3.5a/2013_01_02_12_world_waypoints.sql
diff --git a/sql/updates/world/2013_01_03_00_world_gameobject_scripts.sql b/sql/old/3.3.5a/2013_01_03_00_world_gameobject_scripts.sql
index 32faf4b03a0..32faf4b03a0 100644
--- a/sql/updates/world/2013_01_03_00_world_gameobject_scripts.sql
+++ b/sql/old/3.3.5a/2013_01_03_00_world_gameobject_scripts.sql
diff --git a/sql/updates/world/2013_01_03_01_world_sai.sql b/sql/old/3.3.5a/2013_01_03_01_world_sai.sql
index 9e0e56eb645..9e0e56eb645 100644
--- a/sql/updates/world/2013_01_03_01_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_03_01_world_sai.sql
diff --git a/sql/updates/world/2013_01_03_02_world_sai.sql b/sql/old/3.3.5a/2013_01_03_02_world_sai.sql
index ecd84c96800..ecd84c96800 100644
--- a/sql/updates/world/2013_01_03_02_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_03_02_world_sai.sql
diff --git a/sql/updates/world/2013_01_03_03_world_spelldifficulty_dbc.sql b/sql/old/3.3.5a/2013_01_03_03_world_spelldifficulty_dbc.sql
index 6a41f705491..6a41f705491 100644
--- a/sql/updates/world/2013_01_03_03_world_spelldifficulty_dbc.sql
+++ b/sql/old/3.3.5a/2013_01_03_03_world_spelldifficulty_dbc.sql
diff --git a/sql/updates/world/2013_01_03_04_world_sai.sql b/sql/old/3.3.5a/2013_01_03_04_world_sai.sql
index ccac9266af2..ccac9266af2 100644
--- a/sql/updates/world/2013_01_03_04_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_03_04_world_sai.sql
diff --git a/sql/updates/world/2013_01_03_05_world_sai.sql b/sql/old/3.3.5a/2013_01_03_05_world_sai.sql
index 9e5537835ff..9e5537835ff 100644
--- a/sql/updates/world/2013_01_03_05_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_03_05_world_sai.sql
diff --git a/sql/updates/world/2013_01_03_06_world_sai.sql b/sql/old/3.3.5a/2013_01_03_06_world_sai.sql
index e77122e908e..e77122e908e 100644
--- a/sql/updates/world/2013_01_03_06_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_03_06_world_sai.sql
diff --git a/sql/updates/world/2013_01_03_07_world_sai.sql b/sql/old/3.3.5a/2013_01_03_07_world_sai.sql
index 35a03b9078c..35a03b9078c 100644
--- a/sql/updates/world/2013_01_03_07_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_03_07_world_sai.sql
diff --git a/sql/updates/world/2013_01_03_08_world_misc.sql b/sql/old/3.3.5a/2013_01_03_08_world_misc.sql
index 816b4b4dcf6..816b4b4dcf6 100644
--- a/sql/updates/world/2013_01_03_08_world_misc.sql
+++ b/sql/old/3.3.5a/2013_01_03_08_world_misc.sql
diff --git a/sql/updates/world/2013_01_03_09_world_sai.sql b/sql/old/3.3.5a/2013_01_03_09_world_sai.sql
index c15eeb88843..c15eeb88843 100644
--- a/sql/updates/world/2013_01_03_09_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_03_09_world_sai.sql
diff --git a/sql/updates/world/2013_01_03_10_world_gameobject.sql b/sql/old/3.3.5a/2013_01_03_10_world_gameobject.sql
index 11700da1dc9..11700da1dc9 100644
--- a/sql/updates/world/2013_01_03_10_world_gameobject.sql
+++ b/sql/old/3.3.5a/2013_01_03_10_world_gameobject.sql
diff --git a/sql/updates/world/2013_01_03_11_world_item_template.sql b/sql/old/3.3.5a/2013_01_03_11_world_item_template.sql
index df0bd5cd1e7..df0bd5cd1e7 100644
--- a/sql/updates/world/2013_01_03_11_world_item_template.sql
+++ b/sql/old/3.3.5a/2013_01_03_11_world_item_template.sql
diff --git a/sql/updates/world/2013_01_03_12_world_gameobject_scripts.sql b/sql/old/3.3.5a/2013_01_03_12_world_gameobject_scripts.sql
index aede83aa0c8..aede83aa0c8 100644
--- a/sql/updates/world/2013_01_03_12_world_gameobject_scripts.sql
+++ b/sql/old/3.3.5a/2013_01_03_12_world_gameobject_scripts.sql
diff --git a/sql/updates/world/2013_01_03_12_world_misc.sql b/sql/old/3.3.5a/2013_01_03_12_world_misc.sql
index 79d2e2daea9..79d2e2daea9 100644
--- a/sql/updates/world/2013_01_03_12_world_misc.sql
+++ b/sql/old/3.3.5a/2013_01_03_12_world_misc.sql
diff --git a/sql/updates/world/2013_01_03_13_world_quest_template.sql b/sql/old/3.3.5a/2013_01_03_13_world_quest_template.sql
index 12adb1e94ba..12adb1e94ba 100644
--- a/sql/updates/world/2013_01_03_13_world_quest_template.sql
+++ b/sql/old/3.3.5a/2013_01_03_13_world_quest_template.sql
diff --git a/sql/updates/world/2013_01_03_14_world_spell_area.sql b/sql/old/3.3.5a/2013_01_03_14_world_spell_area.sql
index 352fe0e9d85..352fe0e9d85 100644
--- a/sql/updates/world/2013_01_03_14_world_spell_area.sql
+++ b/sql/old/3.3.5a/2013_01_03_14_world_spell_area.sql
diff --git a/sql/updates/world/2013_01_03_15_world_various_fixes.sql b/sql/old/3.3.5a/2013_01_03_15_world_various_fixes.sql
index d3db9afa6e5..d3db9afa6e5 100644
--- a/sql/updates/world/2013_01_03_15_world_various_fixes.sql
+++ b/sql/old/3.3.5a/2013_01_03_15_world_various_fixes.sql
diff --git a/sql/updates/world/2013_01_03_16_world_various_fixes.sql b/sql/old/3.3.5a/2013_01_03_16_world_various_fixes.sql
index bc5f4f4b6ec..bc5f4f4b6ec 100644
--- a/sql/updates/world/2013_01_03_16_world_various_fixes.sql
+++ b/sql/old/3.3.5a/2013_01_03_16_world_various_fixes.sql
diff --git a/sql/updates/world/2013_01_04_00_world_creature_text.sql b/sql/old/3.3.5a/2013_01_04_00_world_creature_text.sql
index ae38180e1ac..ae38180e1ac 100644
--- a/sql/updates/world/2013_01_04_00_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_04_00_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_04_01_world_sai.sql b/sql/old/3.3.5a/2013_01_04_01_world_sai.sql
index 8e7127e5728..8e7127e5728 100644
--- a/sql/updates/world/2013_01_04_01_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_04_01_world_sai.sql
diff --git a/sql/updates/world/2013_01_04_02_world_misc.sql b/sql/old/3.3.5a/2013_01_04_02_world_misc.sql
index 6833a22ff23..6833a22ff23 100644
--- a/sql/updates/world/2013_01_04_02_world_misc.sql
+++ b/sql/old/3.3.5a/2013_01_04_02_world_misc.sql
diff --git a/sql/updates/world/2013_01_04_02_world_novos_the_summoner.sql b/sql/old/3.3.5a/2013_01_04_02_world_novos_the_summoner.sql
index 49f8b21e3a7..49f8b21e3a7 100644
--- a/sql/updates/world/2013_01_04_02_world_novos_the_summoner.sql
+++ b/sql/old/3.3.5a/2013_01_04_02_world_novos_the_summoner.sql
diff --git a/sql/updates/world/2013_01_05_00_world_waypoints.sql b/sql/old/3.3.5a/2013_01_05_00_world_waypoints.sql
index 4a2d273c552..4a2d273c552 100644
--- a/sql/updates/world/2013_01_05_00_world_waypoints.sql
+++ b/sql/old/3.3.5a/2013_01_05_00_world_waypoints.sql
diff --git a/sql/updates/world/2013_01_06_00_world_creature_addon.sql b/sql/old/3.3.5a/2013_01_06_00_world_creature_addon.sql
index e4412241dce..e4412241dce 100644
--- a/sql/updates/world/2013_01_06_00_world_creature_addon.sql
+++ b/sql/old/3.3.5a/2013_01_06_00_world_creature_addon.sql
diff --git a/sql/updates/world/2013_01_06_00_world_creature_template.sql b/sql/old/3.3.5a/2013_01_06_00_world_creature_template.sql
index 023dc88c870..023dc88c870 100644
--- a/sql/updates/world/2013_01_06_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2013_01_06_00_world_creature_template.sql
diff --git a/sql/updates/world/2013_01_06_01_world_waypoints.sql b/sql/old/3.3.5a/2013_01_06_01_world_waypoints.sql
index a460d33b086..a460d33b086 100644
--- a/sql/updates/world/2013_01_06_01_world_waypoints.sql
+++ b/sql/old/3.3.5a/2013_01_06_01_world_waypoints.sql
diff --git a/sql/updates/world/2013_01_06_02_world_misc.sql b/sql/old/3.3.5a/2013_01_06_02_world_misc.sql
index 8c24975754a..8c24975754a 100644
--- a/sql/updates/world/2013_01_06_02_world_misc.sql
+++ b/sql/old/3.3.5a/2013_01_06_02_world_misc.sql
diff --git a/sql/updates/world/2013_01_06_03_world_sai.sql b/sql/old/3.3.5a/2013_01_06_03_world_sai.sql
index 1cc0962781b..1cc0962781b 100644
--- a/sql/updates/world/2013_01_06_03_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_06_03_world_sai.sql
diff --git a/sql/updates/world/2013_01_06_04_world_misc.sql b/sql/old/3.3.5a/2013_01_06_04_world_misc.sql
index fb1e256fa1b..fb1e256fa1b 100644
--- a/sql/updates/world/2013_01_06_04_world_misc.sql
+++ b/sql/old/3.3.5a/2013_01_06_04_world_misc.sql
diff --git a/sql/updates/world/2013_01_07_00_world_sai.sql b/sql/old/3.3.5a/2013_01_07_00_world_sai.sql
index e289130ddef..e289130ddef 100644
--- a/sql/updates/world/2013_01_07_00_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_07_00_world_sai.sql
diff --git a/sql/updates/world/2013_01_07_01_world_creature_addon.sql b/sql/old/3.3.5a/2013_01_07_01_world_creature_addon.sql
index a83bd028343..a83bd028343 100644
--- a/sql/updates/world/2013_01_07_01_world_creature_addon.sql
+++ b/sql/old/3.3.5a/2013_01_07_01_world_creature_addon.sql
diff --git a/sql/updates/world/2013_01_07_02_world_creature_text.sql b/sql/old/3.3.5a/2013_01_07_02_world_creature_text.sql
index 3e916464615..3e916464615 100644
--- a/sql/updates/world/2013_01_07_02_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_07_02_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_07_03_world_creature_text.sql b/sql/old/3.3.5a/2013_01_07_03_world_creature_text.sql
index c006dc5ef99..c006dc5ef99 100644
--- a/sql/updates/world/2013_01_07_03_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_07_03_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_07_04_world_creature_text.sql b/sql/old/3.3.5a/2013_01_07_04_world_creature_text.sql
index 6fd1d3b95a7..6fd1d3b95a7 100644
--- a/sql/updates/world/2013_01_07_04_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_07_04_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_07_05_world_creature_text.sql b/sql/old/3.3.5a/2013_01_07_05_world_creature_text.sql
index d9d91e784ba..d9d91e784ba 100644
--- a/sql/updates/world/2013_01_07_05_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_07_05_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_07_06_world_creature_text.sql b/sql/old/3.3.5a/2013_01_07_06_world_creature_text.sql
index 5c7d09f9887..5c7d09f9887 100644
--- a/sql/updates/world/2013_01_07_06_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_07_06_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_07_07_world_creature_text.sql b/sql/old/3.3.5a/2013_01_07_07_world_creature_text.sql
index 6f6a0b75713..6f6a0b75713 100644
--- a/sql/updates/world/2013_01_07_07_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_07_07_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_07_08_world_creature_text.sql b/sql/old/3.3.5a/2013_01_07_08_world_creature_text.sql
index 94ab4d925ee..94ab4d925ee 100644
--- a/sql/updates/world/2013_01_07_08_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_07_08_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_07_09_world_buru.sql b/sql/old/3.3.5a/2013_01_07_09_world_buru.sql
index a7e1d5a0ef1..a7e1d5a0ef1 100644
--- a/sql/updates/world/2013_01_07_09_world_buru.sql
+++ b/sql/old/3.3.5a/2013_01_07_09_world_buru.sql
diff --git a/sql/updates/world/2013_01_07_10_world_skeram.sql b/sql/old/3.3.5a/2013_01_07_10_world_skeram.sql
index fb62da5e994..fb62da5e994 100644
--- a/sql/updates/world/2013_01_07_10_world_skeram.sql
+++ b/sql/old/3.3.5a/2013_01_07_10_world_skeram.sql
diff --git a/sql/updates/world/2013_01_07_11_world_sai.sql b/sql/old/3.3.5a/2013_01_07_11_world_sai.sql
index bf4a1ed3c78..bf4a1ed3c78 100644
--- a/sql/updates/world/2013_01_07_11_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_07_11_world_sai.sql
diff --git a/sql/updates/world/2013_01_07_12_world_sai.sql b/sql/old/3.3.5a/2013_01_07_12_world_sai.sql
index bfa06980983..bfa06980983 100644
--- a/sql/updates/world/2013_01_07_12_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_07_12_world_sai.sql
diff --git a/sql/updates/world/2013_01_07_13_world_creature_text.sql b/sql/old/3.3.5a/2013_01_07_13_world_creature_text.sql
index 60d69e3c32a..60d69e3c32a 100644
--- a/sql/updates/world/2013_01_07_13_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_07_13_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_07_14_world_creature_text.sql b/sql/old/3.3.5a/2013_01_07_14_world_creature_text.sql
index d68eb93ff4e..d68eb93ff4e 100644
--- a/sql/updates/world/2013_01_07_14_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_07_14_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_07_15_world_creature_addon.sql b/sql/old/3.3.5a/2013_01_07_15_world_creature_addon.sql
index 2b5ec6c2413..2b5ec6c2413 100644
--- a/sql/updates/world/2013_01_07_15_world_creature_addon.sql
+++ b/sql/old/3.3.5a/2013_01_07_15_world_creature_addon.sql
diff --git a/sql/updates/world/2013_01_07_16_world_creature_addon.sql b/sql/old/3.3.5a/2013_01_07_16_world_creature_addon.sql
index bd5c17c6f67..bd5c17c6f67 100644
--- a/sql/updates/world/2013_01_07_16_world_creature_addon.sql
+++ b/sql/old/3.3.5a/2013_01_07_16_world_creature_addon.sql
diff --git a/sql/updates/world/2013_01_07_17_world_creature_text.sql b/sql/old/3.3.5a/2013_01_07_17_world_creature_text.sql
index 137308da214..137308da214 100644
--- a/sql/updates/world/2013_01_07_17_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_07_17_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_07_18_world_creature_text.sql b/sql/old/3.3.5a/2013_01_07_18_world_creature_text.sql
index b9c6ef8d0c1..b9c6ef8d0c1 100644
--- a/sql/updates/world/2013_01_07_18_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_07_18_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_08_01_world_raise_the_barricades.sql b/sql/old/3.3.5a/2013_01_08_01_world_raise_the_barricades.sql
index 636beb404de..636beb404de 100644
--- a/sql/updates/world/2013_01_08_01_world_raise_the_barricades.sql
+++ b/sql/old/3.3.5a/2013_01_08_01_world_raise_the_barricades.sql
diff --git a/sql/updates/world/2013_01_09_00_world_misc.sql b/sql/old/3.3.5a/2013_01_09_00_world_misc.sql
index a5402c60534..a5402c60534 100644
--- a/sql/updates/world/2013_01_09_00_world_misc.sql
+++ b/sql/old/3.3.5a/2013_01_09_00_world_misc.sql
diff --git a/sql/updates/world/2013_01_09_01_world_lfg_dungeon_rewards.sql b/sql/old/3.3.5a/2013_01_09_01_world_lfg_dungeon_rewards.sql
index dfc5f7cf075..dfc5f7cf075 100644
--- a/sql/updates/world/2013_01_09_01_world_lfg_dungeon_rewards.sql
+++ b/sql/old/3.3.5a/2013_01_09_01_world_lfg_dungeon_rewards.sql
diff --git a/sql/updates/world/2013_01_09_02_world_sai.sql b/sql/old/3.3.5a/2013_01_09_02_world_sai.sql
index bd164ff4b5e..bd164ff4b5e 100644
--- a/sql/updates/world/2013_01_09_02_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_09_02_world_sai.sql
diff --git a/sql/updates/world/2013_01_09_03_world_spell_script_names.sql b/sql/old/3.3.5a/2013_01_09_03_world_spell_script_names.sql
index 14d0eb8bfd9..14d0eb8bfd9 100644
--- a/sql/updates/world/2013_01_09_03_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2013_01_09_03_world_spell_script_names.sql
diff --git a/sql/updates/world/2013_01_10_00_world_trinity_string.sql b/sql/old/3.3.5a/2013_01_10_00_world_trinity_string.sql
index 35d0c1eba99..35d0c1eba99 100644
--- a/sql/updates/world/2013_01_10_00_world_trinity_string.sql
+++ b/sql/old/3.3.5a/2013_01_10_00_world_trinity_string.sql
diff --git a/sql/updates/world/2013_01_10_01_world_sai.sql b/sql/old/3.3.5a/2013_01_10_01_world_sai.sql
index da6c5f994f2..da6c5f994f2 100644
--- a/sql/updates/world/2013_01_10_01_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_10_01_world_sai.sql
diff --git a/sql/updates/world/2013_01_10_02_world_creature_addon.sql b/sql/old/3.3.5a/2013_01_10_02_world_creature_addon.sql
index 4ad14575d36..4ad14575d36 100644
--- a/sql/updates/world/2013_01_10_02_world_creature_addon.sql
+++ b/sql/old/3.3.5a/2013_01_10_02_world_creature_addon.sql
diff --git a/sql/updates/world/2013_01_10_03_world_creature_addon.sql b/sql/old/3.3.5a/2013_01_10_03_world_creature_addon.sql
index ef633331937..ef633331937 100644
--- a/sql/updates/world/2013_01_10_03_world_creature_addon.sql
+++ b/sql/old/3.3.5a/2013_01_10_03_world_creature_addon.sql
diff --git a/sql/updates/world/2013_01_10_04_world_creature_addon.sql b/sql/old/3.3.5a/2013_01_10_04_world_creature_addon.sql
index 74f2356e7a7..74f2356e7a7 100644
--- a/sql/updates/world/2013_01_10_04_world_creature_addon.sql
+++ b/sql/old/3.3.5a/2013_01_10_04_world_creature_addon.sql
diff --git a/sql/updates/world/2013_01_10_05_world_sai.sql b/sql/old/3.3.5a/2013_01_10_05_world_sai.sql
index 82f2a16a113..82f2a16a113 100644
--- a/sql/updates/world/2013_01_10_05_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_10_05_world_sai.sql
diff --git a/sql/updates/world/2013_01_11_00_world_ayamiss.sql b/sql/old/3.3.5a/2013_01_11_00_world_ayamiss.sql
index cbdb7a2ed16..cbdb7a2ed16 100644
--- a/sql/updates/world/2013_01_11_00_world_ayamiss.sql
+++ b/sql/old/3.3.5a/2013_01_11_00_world_ayamiss.sql
diff --git a/sql/old/3.3.5a/2013_01_11_01_world_conditions.sql b/sql/old/3.3.5a/2013_01_11_01_world_conditions.sql
new file mode 100644
index 00000000000..352efb792b4
--- /dev/null
+++ b/sql/old/3.3.5a/2013_01_11_01_world_conditions.sql
@@ -0,0 +1,5 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=36554;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=36554;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(17, 0, 36554, 0, 0, 21, 0, 1024, 0, 0, 1, 103, 0, '', 'Shadowstep - not using Shadowstep while rooted');
diff --git a/sql/old/3.3.5a/2013_01_11_02_world_sai.sql b/sql/old/3.3.5a/2013_01_11_02_world_sai.sql
new file mode 100644
index 00000000000..09466db2e94
--- /dev/null
+++ b/sql/old/3.3.5a/2013_01_11_02_world_sai.sql
@@ -0,0 +1,109 @@
+-- Colonel Zerran SAI
+SET @ENTRY := 15385;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,2,10000,11000,8000,9000,11,24317,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Colonel Zerran - In Combat - Cast Sunder Armor'),
+(@ENTRY,0,1,0,0,0,100,2,12000,13000,8000,9000,11,25462,0,0,0,0,0,6,0,0,0,0,0,0,0, 'Colonel Zerran - In Combat - Cast Enlarge'),
+(@ENTRY,0,2,0,0,0,100,2,13000,17000,14000,18000,23,1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Colonel Zerran - In Combat - Increment phase'),
+(@ENTRY,0,3,0,0,1,100,2,1000,1000,1000,1000,11,40504,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Colonel Zerran - In Combat - Cast Cleave (Phase 1)'),
+(@ENTRY,0,4,0,0,1,100,2,2000,2000,2000,2000,11,40504,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Colonel Zerran - In Combat - Cast Cleave (Phase 1)'),
+(@ENTRY,0,5,0,0,1,100,2,3000,3000,3000,3000,23,0,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Colonel Zerran - In Combat - Decrement phase (Phase 1)');
+
+-- Major Yeggeth SAI
+SET @ENTRY := 15386;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,2,10000,11000,8000,9000,11,24317,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Major Yeggeth - In Combat - Cast Sunder Armor'),
+(@ENTRY,0,1,0,0,0,100,2,12000,13000,8000,9000,11,25282,0,0,0,0,0,6,0,0,0,0,0,0,0, 'Major Yeggeth - In Combat - Cast Shield of Rajaxx'),
+(@ENTRY,0,2,0,0,0,100,2,13000,17000,14000,18000,23,1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Major Yeggeth - In Combat - Increment phase'),
+(@ENTRY,0,3,0,0,1,100,2,1000,1000,1000,1000,11,40504,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Major Yeggeth - In Combat - Cast Cleave (Phase 1)'),
+(@ENTRY,0,4,0,0,1,100,2,2000,2000,2000,2000,11,40504,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Major Yeggeth - In Combat - Cast Cleave (Phase 1)'),
+(@ENTRY,0,5,0,0,1,100,2,3000,3000,3000,3000,23,0,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Major Yeggeth - In Combat - Decrement phase (Phase 1)');
+
+-- Qiraji Warrior SAI
+SET @ENTRY := 15387;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,1,2,0,100,3,0,25,0,0,11,8599,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Qiraji Warrior - @25%HP - Cast Enrage'),
+(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Qiraji Warrior - @20%HP - Say 0');
+
+-- Add aura for Qiraji Warrior
+DELETE FROM `creature_template_addon` WHERE `entry`=15387;
+INSERT INTO `creature_template_addon` (`entry`,`bytes2`,`auras`) VALUES
+(15387,1, '18950');
+
+-- NPC talk text for Qiraji Warrior
+DELETE FROM `creature_text` WHERE `entry` IN (15387);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(15387,0,0, '%s goes into a frenzy!',16,0,100,0,0,0, 'Qiraji Warrior');
+
+-- Major Pakkon SAI
+SET @ENTRY := 15388;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,2,10000,11000,8000,9000,11,24317,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Major Pakkon - In Combat - Cast Sunder Armor'),
+(@ENTRY,0,1,0,0,0,100,2,12000,13000,14000,15000,11,25322,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Major Pakkon - In Combat - Cast Sweeping Slam'),
+(@ENTRY,0,2,0,0,0,100,2,13000,17000,14000,18000,23,1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Major Pakkon - In Combat - Increment phase'),
+(@ENTRY,0,3,0,0,1,100,2,1000,1000,1000,1000,11,40504,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Major Pakkon - In Combat - Cast Cleave (Phase 1)'),
+(@ENTRY,0,4,0,0,1,100,2,2000,2000,2000,2000,11,40504,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Major Pakkon - In Combat - Cast Cleave (Phase 1)'),
+(@ENTRY,0,5,0,0,1,100,2,3000,3000,3000,3000,23,0,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Major Pakkon - In Combat - Decrement phase (Phase 1)');
+
+-- Captain Drenn SAI
+SET @ENTRY := 15389;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,2,10000,11000,8000,9000,11,24317,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Captain Drenn - In Combat - Cast Sunder Armor'),
+(@ENTRY,0,1,0,0,0,100,2,12000,13000,14000,15000,11,26550,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Captain Drenn - In Combat - Cast Lightning Cloud'),
+(@ENTRY,0,2,0,0,0,100,2,13000,17000,14000,18000,23,1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Captain Drenn - In Combat - Increment phase'),
+(@ENTRY,0,3,0,0,1,100,2,1000,1000,1000,1000,11,40504,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Captain Drenn - In Combat - Cast Cleave (Phase 1)'),
+(@ENTRY,0,4,0,0,1,100,2,2000,2000,2000,2000,11,40504,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Captain Drenn - In Combat - Cast Cleave (Phase 1)'),
+(@ENTRY,0,5,0,0,1,100,2,3000,3000,3000,3000,23,0,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Captain Drenn - In Combat - Decrement phase (Phase 1)');
+
+-- Captain Xurrem SAI
+SET @ENTRY := 15390;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,2,10000,11000,8000,9000,11,24317,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Captain Xurrem - In Combat - Cast Sunder Armor'),
+(@ENTRY,0,1,0,0,0,100,2,12000,13000,14000,15000,11,25425,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Captain Xurrem - In Combat - Cast Shockwave'),
+(@ENTRY,0,2,0,0,0,100,2,13000,17000,14000,18000,23,1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Captain Xurrem - In Combat - Increment phase'),
+(@ENTRY,0,3,0,0,1,100,2,1000,1000,1000,1000,11,40504,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Captain Xurrem - In Combat - Cast Cleave (Phase 1)'),
+(@ENTRY,0,4,0,0,1,100,2,2000,2000,2000,2000,11,40504,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Captain Xurrem - In Combat - Cast Cleave (Phase 1)'),
+(@ENTRY,0,5,0,0,1,100,2,3000,3000,3000,3000,23,0,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Captain Xurrem - In Combat - Decrement phase (Phase 1)');
+
+-- Captain Qeez SAI
+SET @ENTRY := 15391;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,2,10000,11000,8000,9000,11,24317,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Captain Qeez - In Combat - Cast Sunder Armor'),
+(@ENTRY,0,1,0,0,0,100,2,12000,13000,14000,15000,11,19134,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Captain Qeez - In Combat - Cast Frightening Shout'),
+(@ENTRY,0,2,0,0,0,100,2,13000,17000,14000,18000,23,1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Captain Qeez - In Combat - Increment phase'),
+(@ENTRY,0,3,0,0,1,100,2,1000,1000,1000,1000,11,40504,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Captain Qeez - In Combat - Cast Cleave (Phase 1)'),
+(@ENTRY,0,4,0,0,1,100,2,2000,2000,2000,2000,11,40504,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Captain Qeez - In Combat - Cast Cleave (Phase 1)'),
+(@ENTRY,0,5,0,0,1,100,2,3000,3000,3000,3000,23,0,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Captain Qeez - In Combat - Decrement phase (Phase 1)');
+
+-- Captain Tuubid SAI
+SET @ENTRY := 15392;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,0,0,100,2,10000,11000,8000,9000,11,24317,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Captain Tuubid - In Combat - Cast Sunder Armor'),
+(@ENTRY,0,1,0,0,0,100,2,12000,13000,14000,15000,11,25471,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Captain Tuubid - In Combat - Cast Attack Order'), -- Needs scripting
+(@ENTRY,0,2,0,0,0,100,2,13000,17000,14000,18000,23,1,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Captain Tuubid - In Combat - Increment phase'),
+(@ENTRY,0,3,0,0,1,100,2,1000,1000,1000,1000,11,40504,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Captain Tuubid - In Combat - Cast Cleave (Phase 1)'),
+(@ENTRY,0,4,0,0,1,100,2,2000,2000,2000,2000,11,40504,0,0,0,0,0,2,0,0,0,0,0,0,0, 'Captain Tuubid - In Combat - Cast Cleave (Phase 1)'),
+(@ENTRY,0,5,0,0,1,100,2,3000,3000,3000,3000,23,0,1,0,0,0,0,2,0,0,0,0,0,0,0, 'Captain Tuubid - In Combat - Decrement phase (Phase 1)');
diff --git a/sql/old/3.3.5a/2013_01_11_03_world_sai.sql b/sql/old/3.3.5a/2013_01_11_03_world_sai.sql
new file mode 100644
index 00000000000..e08252a4894
--- /dev/null
+++ b/sql/old/3.3.5a/2013_01_11_03_world_sai.sql
@@ -0,0 +1,2 @@
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=24683 AND `id`=13;
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=24696 AND `id`=12;
diff --git a/sql/old/3.3.5a/2013_01_11_04_world_sai.sql b/sql/old/3.3.5a/2013_01_11_04_world_sai.sql
new file mode 100644
index 00000000000..3c885d85cc1
--- /dev/null
+++ b/sql/old/3.3.5a/2013_01_11_04_world_sai.sql
@@ -0,0 +1,3 @@
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=23689 AND `id`=5;
+UPDATE `smart_scripts` SET `link`=0, `action_param2`=1 WHERE `entryorguid`=16357 AND `id`=3;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=16357 AND `id`=4;
diff --git a/sql/old/3.3.5a/2013_01_11_05_world_creature_text.sql b/sql/old/3.3.5a/2013_01_11_05_world_creature_text.sql
new file mode 100644
index 00000000000..1283fd86106
--- /dev/null
+++ b/sql/old/3.3.5a/2013_01_11_05_world_creature_text.sql
@@ -0,0 +1,13 @@
+-- NPC talk text for Gatewatcher Gyro-Kill
+DELETE FROM `creature_text` WHERE `entry`=19218;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(19218,0,0, 'I predict a painful death.',14,0,100,0,0,11101, 'Gatewatcher Gyro-Kill - Aggro'),
+(19218,1,0, 'Your strategy was flawed.',14,0,100,0,0,11102, 'Gatewatcher Gyro-Kill - On Kill'),
+(19218,1,1, 'Yes, the only logical outcome.',12,0,100,0,0,11103, 'Gatewatcher Gyro-Kill - On Kill'),
+(19218,2,0, 'Measure twice; cut once.',14,0,100,0,0,11104, 'Gatewatcher Gyro-Kill - Sawblades'),
+(19218,2,1, 'If my division is correct you should be quite dead.',14,0,100,0,0,11105, 'Gatewatcher Gyro-Kill - Sawblades'),
+(19218,3,0, 'An unforeseen... contingency.',14,0,100,0,0,11106, 'Gatewatcher Gyro-Kill - On Death');
+
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=19218;
+DELETE FROM `creature_ai_texts` WHERE `entry` BETWEEN -86 AND -81;
+UPDATE `creature_template` SET `AIName`='', `ScriptName`= 'Boss_Gatewatcher_Gyrokill' WHERE `entry`=19218;
diff --git a/sql/old/3.3.5a/2013_01_12_00_world_smart_scripts.sql b/sql/old/3.3.5a/2013_01_12_00_world_smart_scripts.sql
new file mode 100644
index 00000000000..06562cbd122
--- /dev/null
+++ b/sql/old/3.3.5a/2013_01_12_00_world_smart_scripts.sql
@@ -0,0 +1,7 @@
+-- Hulking Abomination
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=31140;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=31140 AND `source_type`=0;
+INSERT INTO `smart_scripts`(`entryorguid`,`id`,`event_type`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`target_type`,`comment`) VALUES
+(31140,0,6,0,0,0,0,0,11,58995,2,1,'Hulking Abomination - Just died - Cast Exploding Corpse'),
+(31140,1,9,1,8,40,0,0,11,50335,0,7,'Hulking Abomination - Invoker in range of 8 to 40 yards - Cast Scourge Hook'),
+(31140,2,0,0,3000,3000,7000,7000,11,40504,0,2,'Hulking Abomination - In combat - Cast Cleave');
diff --git a/sql/old/3.3.5a/2013_01_12_01_world_string.sql b/sql/old/3.3.5a/2013_01_12_01_world_string.sql
new file mode 100644
index 00000000000..8766e97231d
--- /dev/null
+++ b/sql/old/3.3.5a/2013_01_12_01_world_string.sql
@@ -0,0 +1,3 @@
+DELETE FROM `trinity_string` WHERE `entry`=2029;
+INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`) VALUES
+(2029,'|cff00ff00Ticket Response|r: [%s]|r',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
diff --git a/sql/old/3.3.5a/2013_01_12_02_world_creature_template.sql b/sql/old/3.3.5a/2013_01_12_02_world_creature_template.sql
new file mode 100644
index 00000000000..608af749f15
--- /dev/null
+++ b/sql/old/3.3.5a/2013_01_12_02_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`= 'boss_gatewatcher_gyrokill' WHERE `entry`=19218;
diff --git a/sql/old/3.3.5a/2013_01_12_03_world_gameobject.sql b/sql/old/3.3.5a/2013_01_12_03_world_gameobject.sql
new file mode 100644
index 00000000000..a7a914fceec
--- /dev/null
+++ b/sql/old/3.3.5a/2013_01_12_03_world_gameobject.sql
@@ -0,0 +1,7 @@
+-- Add missing doors to mechanar
+SET @GUID := 6032;
+DELETE FROM `gameobject` WHERE `guid` BETWEEN @GUID AND @GUID+2;
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES 
+(@GUID,184632,554,3,1,236.4597,52.36356,1.653544,3.141593,0,0,-1,0,120,0,1),
+(@GUID+1,184322,554,3,1,242.874,52.314810,1.596334,3.141593,0,0,-1,0,120,0,1),
+(@GUID+2,184449,554,3,1,267.9281,52.31481,27.04254,3.141593,0,0,-1,0,120,0,1);
diff --git a/sql/old/3.3.5a/2013_01_12_03_world_waypoints.sql b/sql/old/3.3.5a/2013_01_12_03_world_waypoints.sql
new file mode 100644
index 00000000000..3903e383ae8
--- /dev/null
+++ b/sql/old/3.3.5a/2013_01_12_03_world_waypoints.sql
@@ -0,0 +1,53 @@
+-- Pathing for Mechano-Lord Capacitus Entry: 19219
+SET @NPC := 83160;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=207.2308,`position_y`=-14.30226,`position_z`=-2.192125 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,207.2308,-14.30226,-2.192125,0,7000,0,0,100,0),
+(@PATH,2,204.4302,-15.78992,-2.192125,0,1000,0,0,100,0),
+(@PATH,3,207.7613,-18.93377,-2.192125,0,0,0,0,100,0),
+(@PATH,4,208.2819,-16.48228,-2.192125,0,1000,0,0,100,0),
+(@PATH,5,228.1113,-0.829701,-0.8854336,0,0,0,0,100,0),
+(@PATH,6,226.6032,19.45208,-1.726556,0,14000,0,0,100,0),
+(@PATH,7,209.7744,-12.69758,-2.192125,0,1000,0,0,100,0),
+(@PATH,8,209.7744,-12.69758,-2.192125,3.141593,1000,0,0,100,0),
+(@PATH,9,228.1113,-0.829701,-0.8854336,0,0,0,0,100,0),
+(@PATH,10,226.6032,19.45208,-1.726556,0,0,0,0,100,0),
+(@PATH,11,204.9646,26.38312,-0.005853632,0,13000,0,0,100,0),
+(@PATH,12,209.7744,-12.69758,-2.192125,0,1000,0,0,100,0),
+(@PATH,13,209.7744,-12.69758,-2.192125,3.141593,1000,0,0,100,0),
+(@PATH,14,224.3664,-23.35326,-2.192125,0,0,0,0,100,0),
+(@PATH,15,231.1084,-38.22675,8.909556E-07,0,15000,0,0,100,0),
+(@PATH,16,209.7744,-12.69758,-2.192125,0,0,0,0,100,0),
+(@PATH,17,209.7744,-12.69758,-2.192125,3.141593,1000,0,0,100,0),
+(@PATH,18,189.2316,-17.36449,-2.192126,0,0,0,0,100,0),
+(@PATH,19,185.7177,-4.297129,-1.142366,0,0,0,0,100,0),
+(@PATH,20,191.9589,6.435908,-0.7838742,0,0,0,0,100,0),
+(@PATH,21,196.1359,21.01234,-1.426585,0,0,0,0,100,0),
+(@PATH,22,207.8954,18.24695,-2.192125,0,0,0,0,100,0),
+(@PATH,23,213.9077,10.01895,-2.192125,0,11000,0,0,100,0),
+(@PATH,24,209.7744,-12.69758,-2.192125,0,0,0,0,100,0),
+(@PATH,25,209.7744,-12.69758,-2.192125,3.141593,2000,0,0,100,0),
+(@PATH,26,203.706,-11.63055,-2.192125,0,10000,0,0,100,0),
+(@PATH,27,206.4484,-14.27736,-2.192125,0,0,0,0,100,0),
+(@PATH,28,208.3172,-13.38252,-2.192125,0,0,0,0,100,0),
+(@PATH,29,209.3133,-12.82924,-2.192125,0,7000,0,0,100,0),
+(@PATH,30,204.3208,-10.91346,-2.192125,0,0,0,0,100,0),
+(@PATH,31,207.38,-13.36442,-2.192125,0,0,0,0,100,0),
+(@PATH,32,207.7303,-11.56095,-2.192125,0,7000,0,0,100,0),
+(@PATH,33,195.6332,-15.0944,-2.192125,0,0,0,0,100,0),
+(@PATH,34,195.4723,-29.45176,-2.192125,0,0,0,0,100,0),
+(@PATH,35,202.765,-41.79265,-2.192125,0,7000,0,0,100,0),
+(@PATH,36,209.7744,-12.69758,-2.192125,0,1000,0,0,100,0),
+(@PATH,37,209.7744,-12.69758,-2.192125,3.141593,1000,0,0,100,0),
+(@PATH,38,189.2316,-17.36449,-2.192126,0,0,0,0,100,0),
+(@PATH,39,185.7177,-4.297129,-1.142366,0,0,0,0,100,0),
+(@PATH,40,191.9589,6.435908,-0.7838742,0,0,0,0,100,0),
+(@PATH,41,196.1359,21.01234,-1.426585,0,0,0,0,100,0),
+(@PATH,42,207.8954,18.24695,-2.192125,0,0,0,0,100,0),
+(@PATH,43,213.9077,10.01895,-2.192125,0,6000,0,0,100,0),
+(@PATH,44,209.7744,-12.69758,-2.192125,0,20000,0,0,100,0),
+(@PATH,45,210.4122,-9.19214,-2.192125,0,0,0,0,100,0);
diff --git a/sql/old/3.3.5a/2013_01_12_04_world_misc.sql b/sql/old/3.3.5a/2013_01_12_04_world_misc.sql
new file mode 100644
index 00000000000..5ba81aa39f1
--- /dev/null
+++ b/sql/old/3.3.5a/2013_01_12_04_world_misc.sql
@@ -0,0 +1,28 @@
+UPDATE `creature_template` SET `AIName` = '',`ScriptName` = 'boss_mechano_lord_capacitus' WHERE `entry` =19219;
+UPDATE `creature_template` SET `unit_flags`=`unit_flags` |2 |33554432 WHERE `entry` IN (20405,21534); -- Nether Charge
+
+DELETE FROM `creature_ai_scripts` WHERE `creature_id` IN (19219,20405);
+DELETE FROM `creature_ai_texts` WHERE `entry` BETWEEN -92 AND -87;
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (20405,21534);
+INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(20405,0,0,0,0,0,'37670 35150'), -- Nether Charge
+(21534,0,0,0,0,0,'37670 35150'); -- Nether Charge (1)
+
+SET @ENTRY := 20405; -- Nether Charge
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
+UPDATE creature_template SET AIName="SmartAI" WHERE entry=@ENTRY LIMIT 1;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES 
+(@ENTRY,0,0,0,0,0,100,0,14000,14000,1000,1000,11,35151,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,"Nether Bomb - Nether Charge Pulse"),
+(@ENTRY,0,1,0,0,0,100,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,"Nether Charge - No Melee"),
+(@ENTRY,0,2,0,0,0,100,0,0,0,14000,14000,21,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0.0,"Nether Charge - Prevent Combat Movement When Start...");
+
+DELETE FROM `creature_text` WHERE `entry` = 19219;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(19219, 0, 0, 'You should split while you can.', 14, 0, 100, 0, 0, 11162, 'Mechano-Lord Capacitus - Aggro'),
+(19219, 1, 0, 'Go ahead, gimme your best shot. I can take it!', 14, 0, 100, 0, 0, 11166, 'Mechano-Lord Capacitus - Yells'), -- Reflective Damage Shield
+(19219, 2, 0, 'Think you can hurt me, huh? Think I''m afraid a'' you?', 14, 0, 100, 0, 0, 11165, 'Mechano-Lord Capacitus - Yells'), -- Reflective Magic Shield
+(19219, 3, 0, 'Can''t say I didn''t warn you!', 14, 0, 100, 0, 0, 11163, 'Mechano-Lord Capacitus - Killing a player'),
+(19219, 3, 1, 'Damn, I''m good!', 14, 0, 100, 0, 0, 11164, 'Mechano-Lord Capacitus - Killing a player'),
+(19219, 4, 0, 'Bully!', 14, 0, 100, 0, 0, 11167, 'Mechano-Lord Capacitus - Death');
diff --git a/sql/old/3.3.5a/2013_01_12_05_world_waypoint_script.sql b/sql/old/3.3.5a/2013_01_12_05_world_waypoint_script.sql
new file mode 100644
index 00000000000..639b27b911e
--- /dev/null
+++ b/sql/old/3.3.5a/2013_01_12_05_world_waypoint_script.sql
@@ -0,0 +1 @@
+DELETE FROM `waypoint_scripts` WHERE `id` = 8316001;
diff --git a/sql/old/3.3.5a/2013_01_13_00_world_gameobject_template.sql b/sql/old/3.3.5a/2013_01_13_00_world_gameobject_template.sql
new file mode 100644
index 00000000000..056dfea0bc9
--- /dev/null
+++ b/sql/old/3.3.5a/2013_01_13_00_world_gameobject_template.sql
@@ -0,0 +1 @@
+UPDATE `gameobject_template` SET `ScriptName`='' WHERE `entry`=130511;
diff --git a/sql/old/3.3.5a/2013_01_13_01_world_sai.sql b/sql/old/3.3.5a/2013_01_13_01_world_sai.sql
new file mode 100644
index 00000000000..a8513d88ab0
--- /dev/null
+++ b/sql/old/3.3.5a/2013_01_13_01_world_sai.sql
@@ -0,0 +1,41 @@
+SET @CONTROL_WATCHER := 58524;
+SET @ETHREAL         := 58548;
+SET @GOSSIP          := 10028;
+SET @EYE             := 193058;
+SET @WATCHER         := 31110;
+SET @MIRROR_NPC      := 31005;
+SET @FIGMENT_SPELL   := 57530; 
+SET @PLAYER_MIRROR   := 58122;
+SET @CONTROL_START   := 58120;
+SET @MIRROR_SPELL    := 57528;
+SET @WEAPON_COPY     := 41055;
+SET @COPY_OFF_HAND   := 45205;
+
+UPDATE `creature_template` SET `spell1` = 58541, `spell2` = 58544, `spell3` = 58543, `spell4` = 58562, `spell5` = 58563, `spell6` = 58658 WHERE `entry` = @WATCHER;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@MIRROR_NPC;
+UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry`= @EYE;
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = @WATCHER;
+DELETE FROM `smart_scripts` WHERE `entryorguid`= @EYE;
+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 
+(@EYE,1,0,1,62,0,100,0,@GOSSIP,0,0,0,85,@CONTROL_WATCHER,2,0,0,0,0,7,0,0,0,0,0,0,0, 'On Gossip Option Select - Cast Control Eidolon Watcher - Action Invoker'),
+(@EYE,1,1,2,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Eye of Dominion - On link - Close Gossip Option'),
+(@EYE,1,2,3,61,0,100,0,0,0,0,0,85,@PLAYER_MIRROR,2,0,0,0,0,7,0,0,0,0,0,0,0, 'Eye of Dominion - On link - Summon Player Mirror'),
+(@EYE,1,3,0,61,0,100,0,0,0,0,0,15,13168,0,0,0,0,0,7,0,0,0,0,0,0,0, 'Eye of Dominion - On link - Complete quest');
+DELETE FROM `smart_scripts` WHERE `entryorguid`= @MIRROR_NPC;
+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 
+(@MIRROR_NPC,0,0,1,54,0,100,1,0,0,0,0,85,@MIRROR_SPELL,2,0,0,0,0,1,0,0,0,0,0,0,0, 'On spawn - Cast Mirror Spell - Action Invoker'),
+(@MIRROR_NPC,0,1,2,61,0,100,1,0,0,0,0,85,@WEAPON_COPY,2,0,0,0,0,1,0,0,0,0,0,0,0,'On Link - Copy Main Hand - Action Invoker'),
+(@MIRROR_NPC,0,2,3,61,0,100,1,0,0,0,0,85,@COPY_OFF_HAND,2,0,0,0,0,1,0,0,0,0,0,0,0,'On Link - Copy Offhand - Action Invoker'),
+(@MIRROR_NPC,0,3,0,61,0,100,1,0,0,0,0,11,@CONTROL_START,2,0,0,0,0,1,0,0,0,0,0,0,0,'On Spawn - Cast Start Control - Action Invoker');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@WATCHER;
+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 
+(@WATCHER,0,0,0,54,0,100,1,0,0,0,0,11,@ETHREAL,2,0,0,0,0,1,0,0,0,0,0,0,0, 'On spawn - Cast Ethreal Aura - On self');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = @EYE;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES 
+(22,4,@EYE,1,0,9,0,13168,0,0,0,0,'','Execute SAI line only if player has quest active');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=@MIRROR_SPELL;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,7,@MIRROR_SPELL,0,0,31,0,3,@MIRROR_NPC,0,0,0,'','Spell target Mirror npc');
diff --git a/sql/old/3.3.5a/2013_01_13_02_world_gluttonous_lurkers.sql b/sql/old/3.3.5a/2013_01_13_02_world_gluttonous_lurkers.sql
new file mode 100644
index 00000000000..71f8efbe0c3
--- /dev/null
+++ b/sql/old/3.3.5a/2013_01_13_02_world_gluttonous_lurkers.sql
@@ -0,0 +1,36 @@
+-- Quest: Gluttonous Lurkers (12527)
+-- Zul'drak Rat: Spellclick spells
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry`=28202;
+INSERT INTO `npc_spellclick_spells`(`npc_entry`,`spell_id`,`cast_flags`) VALUE
+(28202,50926,1),
+(28202,50927,2);
+
+-- Zul'drak Rat: SAI
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=28202;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=28202 AND `source_type`=0;
+INSERT INTO `smart_scripts`(`entryorguid`,`event_type`,`event_param1`,`action_type`,`target_type`,`comment`) VALUES
+(28202,8,50926,41,1,'Zuldrak Rat - On spell hit of Gluttonous Lurkers: Create ZulDrak Rat Cover - Despawn');
+
+-- Zul'drak Rat spell: Script assignment
+DELETE FROM `spell_script_names` WHERE `spell_id`=50894;
+INSERT INTO `spell_script_names`(`spell_id`,`ScriptName`) VALUE
+(50894,'spell_zuldrak_rat');
+
+-- Zul'drak Rat spell: Conditions
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=50894;
+INSERT INTO `conditions`(`SourceTypeOrReferenceId`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ErrorType`,`Comment`) VALUE
+(17,50894,31,1,3,28145,12,'Zuldrak Rat - Target has to be Lurking Basilisk');
+
+-- Lurking Basilisk: SAI
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=28145;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=28145;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=28145 AND `source_type`=0;
+INSERT INTO `smart_scripts`(`entryorguid`,`event_type`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`target_type`,`comment`) VALUE
+(28145,0,5000,5000,17000,27000,11,54470,2,'Lurking Basilisk - In Combat - Cast Venemous Bite');
+
+-- Gorged Lurking Basilisk: SAI
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=28203;
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=28203;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=28203 AND `source_type`=0;
+INSERT INTO `smart_scripts`(`entryorguid`,`event_type`,`event_param1`,`action_type`,`target_type`,`comment`) VALUES
+(28203,8,50918,41,1,'Gorged Lurking Basilisk - On Spell Hit of Create Basilisk Crystals Cover - Despawn');
diff --git a/sql/old/3.3.5a/2013_01_13_03_world_spell_script_names.sql b/sql/old/3.3.5a/2013_01_13_03_world_spell_script_names.sql
new file mode 100644
index 00000000000..a776ea4a765
--- /dev/null
+++ b/sql/old/3.3.5a/2013_01_13_03_world_spell_script_names.sql
@@ -0,0 +1,4 @@
+-- Zul'drak Rat spell: Script assignment
+DELETE FROM `spell_script_names` WHERE `spell_id`=50894;
+INSERT INTO `spell_script_names`(`spell_id`,`ScriptName`) VALUE
+(50894,'spell_q12527_zuldrak_rat');
diff --git a/sql/old/3.3.5a/2013_01_13_04_world_conditions.sql b/sql/old/3.3.5a/2013_01_13_04_world_conditions.sql
new file mode 100644
index 00000000000..eaf45d5d696
--- /dev/null
+++ b/sql/old/3.3.5a/2013_01_13_04_world_conditions.sql
@@ -0,0 +1,9 @@
+SET @EYE := 193058;
+SET @MIRROR_SPELL := 57528;
+SET @MIRROR_NPC := 31005;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = @EYE;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (13,17) AND `SourceEntry`=@MIRROR_SPELL;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES 
+(22,1,@EYE,1,0,9,0,13168,0,0,0,0,'','Execute SAI line only if player has quest active'),
+(17,0,@MIRROR_SPELL,0,0,31,0,3,@MIRROR_NPC,0,0,0,'','Spell target Mirror npc');
diff --git a/sql/updates/world/2013_01_14_00_world_version.sql b/sql/updates/world/2013_01_14_00_world_version.sql
new file mode 100644
index 00000000000..0bc0a89a8a4
--- /dev/null
+++ b/sql/updates/world/2013_01_14_00_world_version.sql
@@ -0,0 +1 @@
+UPDATE `version` SET `db_version`='TDB 335.50', `cache_id`=50 LIMIT 1;