Merge remote-tracking branch 'origin/master' into 4.3.4

99 files changed, 64 insertions, 71 deletions

diff --git a/sql/updates/world/2013_01_14_00_world_version.sql b/sql/old/3.3.5a/2013_01_14_00_world_version.sql
index 0bc0a89a8a4..0bc0a89a8a4 100644
--- a/sql/updates/world/2013_01_14_00_world_version.sql
+++ b/sql/old/3.3.5a/2013_01_14_00_world_version.sql
diff --git a/sql/updates/world/2013_01_14_01_world_game_event.sql b/sql/old/3.3.5a/2013_01_14_01_world_game_event.sql
index d4d30d54928..d4d30d54928 100644
--- a/sql/updates/world/2013_01_14_01_world_game_event.sql
+++ b/sql/old/3.3.5a/2013_01_14_01_world_game_event.sql
diff --git a/sql/updates/world/2013_01_14_02_world_ip2nationcountries.sql b/sql/old/3.3.5a/2013_01_14_02_world_ip2nationcountries.sql
index fdb96fd895e..fdb96fd895e 100644
--- a/sql/updates/world/2013_01_14_02_world_ip2nationcountries.sql
+++ b/sql/old/3.3.5a/2013_01_14_02_world_ip2nationcountries.sql
diff --git a/sql/updates/world/2013_01_14_03_world_lefty_loosy_righty_tighty.sql b/sql/old/3.3.5a/2013_01_14_03_world_lefty_loosy_righty_tighty.sql
index 5d322ac2dd9..5d322ac2dd9 100644
--- a/sql/updates/world/2013_01_14_03_world_lefty_loosy_righty_tighty.sql
+++ b/sql/old/3.3.5a/2013_01_14_03_world_lefty_loosy_righty_tighty.sql
diff --git a/sql/updates/world/2013_01_15_00_world_creature.sql b/sql/old/3.3.5a/2013_01_15_00_world_creature.sql
index e49918aa0b6..e49918aa0b6 100644
--- a/sql/updates/world/2013_01_15_00_world_creature.sql
+++ b/sql/old/3.3.5a/2013_01_15_00_world_creature.sql
diff --git a/sql/updates/world/2013_01_15_01_world_misc.sql b/sql/old/3.3.5a/2013_01_15_01_world_misc.sql
index 48238e5dacf..48238e5dacf 100644
--- a/sql/updates/world/2013_01_15_01_world_misc.sql
+++ b/sql/old/3.3.5a/2013_01_15_01_world_misc.sql
diff --git a/sql/updates/world/2013_01_15_02_world_game_event.sql b/sql/old/3.3.5a/2013_01_15_02_world_game_event.sql
index 3300c0667ce..3300c0667ce 100644
--- a/sql/updates/world/2013_01_15_02_world_game_event.sql
+++ b/sql/old/3.3.5a/2013_01_15_02_world_game_event.sql
diff --git a/sql/updates/world/2013_01_15_03_world_misc.sql b/sql/old/3.3.5a/2013_01_15_03_world_misc.sql
index 5de9e0ab13a..5de9e0ab13a 100644
--- a/sql/updates/world/2013_01_15_03_world_misc.sql
+++ b/sql/old/3.3.5a/2013_01_15_03_world_misc.sql
diff --git a/sql/updates/world/2013_01_15_04_world_game_event.sql b/sql/old/3.3.5a/2013_01_15_04_world_game_event.sql
index cfbd399e43d..cfbd399e43d 100644
--- a/sql/updates/world/2013_01_15_04_world_game_event.sql
+++ b/sql/old/3.3.5a/2013_01_15_04_world_game_event.sql
diff --git a/sql/updates/world/2013_01_15_05_world_creature_addon.sql b/sql/old/3.3.5a/2013_01_15_05_world_creature_addon.sql
index 94782891ca1..94782891ca1 100644
--- a/sql/updates/world/2013_01_15_05_world_creature_addon.sql
+++ b/sql/old/3.3.5a/2013_01_15_05_world_creature_addon.sql
diff --git a/sql/updates/world/2013_01_15_06_world_spell_script_names.sql b/sql/old/3.3.5a/2013_01_15_06_world_spell_script_names.sql
index 0e327bdc63d..0e327bdc63d 100644
--- a/sql/updates/world/2013_01_15_06_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2013_01_15_06_world_spell_script_names.sql
diff --git a/sql/updates/world/2013_01_16_00_world_gossip_menu.sql b/sql/old/3.3.5a/2013_01_16_00_world_gossip_menu.sql
index 1b0554931fa..1b0554931fa 100644
--- a/sql/updates/world/2013_01_16_00_world_gossip_menu.sql
+++ b/sql/old/3.3.5a/2013_01_16_00_world_gossip_menu.sql
diff --git a/sql/updates/world/2013_01_16_01_world_creature_text.sql b/sql/old/3.3.5a/2013_01_16_01_world_creature_text.sql
index 69bdd91b886..69bdd91b886 100644
--- a/sql/updates/world/2013_01_16_01_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_16_01_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_17_00_world_creature_template.sql b/sql/old/3.3.5a/2013_01_17_00_world_creature_template.sql
index af602096440..af602096440 100644
--- a/sql/updates/world/2013_01_17_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2013_01_17_00_world_creature_template.sql
diff --git a/sql/updates/world/2013_01_17_01_world_creature.sql b/sql/old/3.3.5a/2013_01_17_01_world_creature.sql
index 84ded6edcb2..84ded6edcb2 100644
--- a/sql/updates/world/2013_01_17_01_world_creature.sql
+++ b/sql/old/3.3.5a/2013_01_17_01_world_creature.sql
diff --git a/sql/updates/world/2013_01_18_00_world_misc.sql b/sql/old/3.3.5a/2013_01_18_00_world_misc.sql
index e15a13f51a5..e15a13f51a5 100644
--- a/sql/updates/world/2013_01_18_00_world_misc.sql
+++ b/sql/old/3.3.5a/2013_01_18_00_world_misc.sql
diff --git a/sql/updates/world/2013_01_18_01_world_creature_template_addon.sql b/sql/old/3.3.5a/2013_01_18_01_world_creature_template_addon.sql
index e3d6feaeecd..e3d6feaeecd 100644
--- a/sql/updates/world/2013_01_18_01_world_creature_template_addon.sql
+++ b/sql/old/3.3.5a/2013_01_18_01_world_creature_template_addon.sql
diff --git a/sql/updates/world/2013_01_18_02_world_creature_template_addon.sql b/sql/old/3.3.5a/2013_01_18_02_world_creature_template_addon.sql
index 716d59d8724..716d59d8724 100644
--- a/sql/updates/world/2013_01_18_02_world_creature_template_addon.sql
+++ b/sql/old/3.3.5a/2013_01_18_02_world_creature_template_addon.sql
diff --git a/sql/updates/world/2013_01_19_00_world_creature_text.sql b/sql/old/3.3.5a/2013_01_19_00_world_creature_text.sql
index ed52fe13b29..ed52fe13b29 100644
--- a/sql/updates/world/2013_01_19_00_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_19_00_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_19_01_world_creature_text.sql b/sql/old/3.3.5a/2013_01_19_01_world_creature_text.sql
index 4fb6bc55c87..4fb6bc55c87 100644
--- a/sql/updates/world/2013_01_19_01_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_19_01_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_19_02_world_conditions.sql b/sql/old/3.3.5a/2013_01_19_02_world_conditions.sql
index 744029f4fa0..744029f4fa0 100644
--- a/sql/updates/world/2013_01_19_02_world_conditions.sql
+++ b/sql/old/3.3.5a/2013_01_19_02_world_conditions.sql
diff --git a/sql/updates/world/2013_01_19_03_world_creature_text.sql b/sql/old/3.3.5a/2013_01_19_03_world_creature_text.sql
index d9a15f4da7a..d9a15f4da7a 100644
--- a/sql/updates/world/2013_01_19_03_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_19_03_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_19_04_world_creature_addon.sql b/sql/old/3.3.5a/2013_01_19_04_world_creature_addon.sql
index fbe99d8edf2..fbe99d8edf2 100644
--- a/sql/updates/world/2013_01_19_04_world_creature_addon.sql
+++ b/sql/old/3.3.5a/2013_01_19_04_world_creature_addon.sql
diff --git a/sql/updates/world/2013_01_19_04_world_creature_text.sql b/sql/old/3.3.5a/2013_01_19_04_world_creature_text.sql
index c14cf5c149a..c14cf5c149a 100644
--- a/sql/updates/world/2013_01_19_04_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_19_04_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_19_05_world_creature_addon.sql b/sql/old/3.3.5a/2013_01_19_05_world_creature_addon.sql
index 0a384501e36..0a384501e36 100644
--- a/sql/updates/world/2013_01_19_05_world_creature_addon.sql
+++ b/sql/old/3.3.5a/2013_01_19_05_world_creature_addon.sql
diff --git a/sql/updates/world/2013_01_19_06_world_misc.sql b/sql/old/3.3.5a/2013_01_19_06_world_misc.sql
index 55d9777a71c..55d9777a71c 100644
--- a/sql/updates/world/2013_01_19_06_world_misc.sql
+++ b/sql/old/3.3.5a/2013_01_19_06_world_misc.sql
diff --git a/sql/updates/world/2013_01_19_06_world_trinity_string.sql b/sql/old/3.3.5a/2013_01_19_06_world_trinity_string.sql
index 322d43a7720..322d43a7720 100644
--- a/sql/updates/world/2013_01_19_06_world_trinity_string.sql
+++ b/sql/old/3.3.5a/2013_01_19_06_world_trinity_string.sql
diff --git a/sql/updates/world/2013_01_20_00_world_sai.sql b/sql/old/3.3.5a/2013_01_20_00_world_sai.sql
index d4e4bb81c41..d4e4bb81c41 100644
--- a/sql/updates/world/2013_01_20_00_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_20_00_world_sai.sql
diff --git a/sql/updates/world/2013_01_20_01_world_creature_text.sql b/sql/old/3.3.5a/2013_01_20_01_world_creature_text.sql
index d543b02d9fc..d543b02d9fc 100644
--- a/sql/updates/world/2013_01_20_01_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_20_01_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_20_02_world_creature_text.sql b/sql/old/3.3.5a/2013_01_20_02_world_creature_text.sql
index 25c8c046dfc..25c8c046dfc 100644
--- a/sql/updates/world/2013_01_20_02_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_20_02_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_20_03_world_creature_text.sql b/sql/old/3.3.5a/2013_01_20_03_world_creature_text.sql
index 1ea2c121e1e..1ea2c121e1e 100644
--- a/sql/updates/world/2013_01_20_03_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_20_03_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_20_03_world_spell_script_names.sql b/sql/old/3.3.5a/2013_01_20_03_world_spell_script_names.sql
index 0cd28de0472..0cd28de0472 100644
--- a/sql/updates/world/2013_01_20_03_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2013_01_20_03_world_spell_script_names.sql
diff --git a/sql/updates/world/2013_01_20_04_world_creature_text.sql b/sql/old/3.3.5a/2013_01_20_04_world_creature_text.sql
index 5c457530f92..5c457530f92 100644
--- a/sql/updates/world/2013_01_20_04_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_20_04_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_20_05_world_sai.sql b/sql/old/3.3.5a/2013_01_20_05_world_sai.sql
index 9539bc546b1..9539bc546b1 100644
--- a/sql/updates/world/2013_01_20_05_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_20_05_world_sai.sql
diff --git a/sql/updates/world/2013_01_20_06_world_creature.sql b/sql/old/3.3.5a/2013_01_20_06_world_creature.sql
index c00ff11ea4a..c00ff11ea4a 100644
--- a/sql/updates/world/2013_01_20_06_world_creature.sql
+++ b/sql/old/3.3.5a/2013_01_20_06_world_creature.sql
diff --git a/sql/updates/world/2013_01_20_07_world_sai.sql b/sql/old/3.3.5a/2013_01_20_07_world_sai.sql
index f8d001e73db..f8d001e73db 100644
--- a/sql/updates/world/2013_01_20_07_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_20_07_world_sai.sql
diff --git a/sql/updates/world/2013_01_20_08_world_sai.sql b/sql/old/3.3.5a/2013_01_20_08_world_sai.sql
index 411d69e08d2..411d69e08d2 100644
--- a/sql/updates/world/2013_01_20_08_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_20_08_world_sai.sql
diff --git a/sql/updates/world/2013_01_20_09_world_spell_dbc.sql b/sql/old/3.3.5a/2013_01_20_09_world_spell_dbc.sql
index d8f466173f3..d8f466173f3 100644
--- a/sql/updates/world/2013_01_20_09_world_spell_dbc.sql
+++ b/sql/old/3.3.5a/2013_01_20_09_world_spell_dbc.sql
diff --git a/sql/updates/world/2013_01_21_00_world_misc.sql b/sql/old/3.3.5a/2013_01_21_00_world_misc.sql
index c023003783e..c023003783e 100644
--- a/sql/updates/world/2013_01_21_00_world_misc.sql
+++ b/sql/old/3.3.5a/2013_01_21_00_world_misc.sql
diff --git a/sql/updates/world/2013_01_21_01_world_creature_template.sql b/sql/old/3.3.5a/2013_01_21_01_world_creature_template.sql
index d5bf4525ff6..d5bf4525ff6 100644
--- a/sql/updates/world/2013_01_21_01_world_creature_template.sql
+++ b/sql/old/3.3.5a/2013_01_21_01_world_creature_template.sql
diff --git a/sql/updates/world/2013_01_21_02_world_sai.sql b/sql/old/3.3.5a/2013_01_21_02_world_sai.sql
index 31070c48718..31070c48718 100644
--- a/sql/updates/world/2013_01_21_02_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_21_02_world_sai.sql
diff --git a/sql/updates/world/2013_01_22_00_world_command.sql b/sql/old/3.3.5a/2013_01_22_00_world_command.sql
index 6c89951d036..6c89951d036 100644
--- a/sql/updates/world/2013_01_22_00_world_command.sql
+++ b/sql/old/3.3.5a/2013_01_22_00_world_command.sql
diff --git a/sql/updates/world/2013_01_22_01_world_sai.sql b/sql/old/3.3.5a/2013_01_22_01_world_sai.sql
index b41fb25110d..b41fb25110d 100644
--- a/sql/updates/world/2013_01_22_01_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_22_01_world_sai.sql
diff --git a/sql/updates/world/2013_01_23_00_world_misc.sql b/sql/old/3.3.5a/2013_01_23_00_world_misc.sql
index fb55d90f69b..fb55d90f69b 100644
--- a/sql/updates/world/2013_01_23_00_world_misc.sql
+++ b/sql/old/3.3.5a/2013_01_23_00_world_misc.sql
diff --git a/sql/updates/world/2013_01_23_01_world_misc.sql b/sql/old/3.3.5a/2013_01_23_01_world_misc.sql
index 25042e241dd..25042e241dd 100644
--- a/sql/updates/world/2013_01_23_01_world_misc.sql
+++ b/sql/old/3.3.5a/2013_01_23_01_world_misc.sql
diff --git a/sql/updates/world/2013_01_23_02_world_spell_script_names.sql b/sql/old/3.3.5a/2013_01_23_02_world_spell_script_names.sql
index d56c6ad1c59..d56c6ad1c59 100644
--- a/sql/updates/world/2013_01_23_02_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2013_01_23_02_world_spell_script_names.sql
diff --git a/sql/updates/world/2013_01_24_00_world_sai.sql b/sql/old/3.3.5a/2013_01_24_00_world_sai.sql
index 516af5a1504..516af5a1504 100644
--- a/sql/updates/world/2013_01_24_00_world_sai.sql
+++ b/sql/old/3.3.5a/2013_01_24_00_world_sai.sql
diff --git a/sql/updates/world/2013_01_25_00_world_creature_text.sql b/sql/old/3.3.5a/2013_01_25_00_world_creature_text.sql
index 25354a70390..25354a70390 100644
--- a/sql/updates/world/2013_01_25_00_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_01_25_00_world_creature_text.sql
diff --git a/sql/updates/world/2013_01_25_01_world_creature_classlevelstats.sql b/sql/old/3.3.5a/2013_01_25_01_world_creature_classlevelstats.sql
index 5d0a916dfb8..5d0a916dfb8 100644
--- a/sql/updates/world/2013_01_25_01_world_creature_classlevelstats.sql
+++ b/sql/old/3.3.5a/2013_01_25_01_world_creature_classlevelstats.sql
diff --git a/sql/updates/world/2013_01_25_02_world_smart_scripts.sql b/sql/old/3.3.5a/2013_01_25_02_world_smart_scripts.sql
index 69d48686429..69d48686429 100644
--- a/sql/updates/world/2013_01_25_02_world_smart_scripts.sql
+++ b/sql/old/3.3.5a/2013_01_25_02_world_smart_scripts.sql
diff --git a/sql/updates/world/2013_01_26_00_world_misc.sql b/sql/old/3.3.5a/2013_01_26_00_world_misc.sql
index 429d900d765..429d900d765 100644
--- a/sql/updates/world/2013_01_26_00_world_misc.sql
+++ b/sql/old/3.3.5a/2013_01_26_00_world_misc.sql
diff --git a/sql/updates/world/2013_01_26_01_world_creature_loot_template.sql b/sql/old/3.3.5a/2013_01_26_01_world_creature_loot_template.sql
index 5d667b99cb5..5d667b99cb5 100644
--- a/sql/updates/world/2013_01_26_01_world_creature_loot_template.sql
+++ b/sql/old/3.3.5a/2013_01_26_01_world_creature_loot_template.sql
diff --git a/sql/updates/world/2013_01_26_02_world_reference_loot_template.sql b/sql/old/3.3.5a/2013_01_26_02_world_reference_loot_template.sql
index d4e5a9fa622..d4e5a9fa622 100644
--- a/sql/updates/world/2013_01_26_02_world_reference_loot_template.sql
+++ b/sql/old/3.3.5a/2013_01_26_02_world_reference_loot_template.sql
diff --git a/sql/updates/world/2013_01_26_03_world_conditions.sql b/sql/old/3.3.5a/2013_01_26_03_world_conditions.sql
index cc7ab333f4a..cc7ab333f4a 100644
--- a/sql/updates/world/2013_01_26_03_world_conditions.sql
+++ b/sql/old/3.3.5a/2013_01_26_03_world_conditions.sql
diff --git a/sql/updates/world/2013_01_26_04_world_item_loot_template.sql b/sql/old/3.3.5a/2013_01_26_04_world_item_loot_template.sql
index 32cf116167e..32cf116167e 100644
--- a/sql/updates/world/2013_01_26_04_world_item_loot_template.sql
+++ b/sql/old/3.3.5a/2013_01_26_04_world_item_loot_template.sql
diff --git a/sql/updates/world/2013_01_26_05_world_misc.sql b/sql/old/3.3.5a/2013_01_26_05_world_misc.sql
index ff8cf4d1e77..ff8cf4d1e77 100644
--- a/sql/updates/world/2013_01_26_05_world_misc.sql
+++ b/sql/old/3.3.5a/2013_01_26_05_world_misc.sql
diff --git a/sql/updates/world/2013_01_26_05_world_misc_pinfo.sql b/sql/old/3.3.5a/2013_01_26_05_world_misc_pinfo.sql
index 2c0a28066d4..2c0a28066d4 100644
--- a/sql/updates/world/2013_01_26_05_world_misc_pinfo.sql
+++ b/sql/old/3.3.5a/2013_01_26_05_world_misc_pinfo.sql
diff --git a/sql/updates/world/2013_01_26_06_world_creature_template.sql b/sql/old/3.3.5a/2013_01_26_06_world_creature_template.sql
index e54949744f6..e54949744f6 100644
--- a/sql/updates/world/2013_01_26_06_world_creature_template.sql
+++ b/sql/old/3.3.5a/2013_01_26_06_world_creature_template.sql
diff --git a/sql/updates/world/2013_01_26_07_world_gameobject_template.sql b/sql/old/3.3.5a/2013_01_26_07_world_gameobject_template.sql
index c68e48754dc..c68e48754dc 100644
--- a/sql/updates/world/2013_01_26_07_world_gameobject_template.sql
+++ b/sql/old/3.3.5a/2013_01_26_07_world_gameobject_template.sql
diff --git a/sql/updates/auth/2013_01_27_00_auth_realmlist.sql b/sql/old/3.3.5a/2013_01_27_00_auth_realmlist.sql
index 0c3b18448e6..0c3b18448e6 100644
--- a/sql/updates/auth/2013_01_27_00_auth_realmlist.sql
+++ b/sql/old/3.3.5a/2013_01_27_00_auth_realmlist.sql
diff --git a/sql/updates/world/2013_01_27_00_world_creature.sql b/sql/old/3.3.5a/2013_01_27_00_world_creature.sql
index b60f8f60eba..b60f8f60eba 100644
--- a/sql/updates/world/2013_01_27_00_world_creature.sql
+++ b/sql/old/3.3.5a/2013_01_27_00_world_creature.sql
diff --git a/sql/updates/world/2013_01_27_01_world_gameobject_template.sql b/sql/old/3.3.5a/2013_01_27_01_world_gameobject_template.sql
index 49bbf3be56a..49bbf3be56a 100644
--- a/sql/updates/world/2013_01_27_01_world_gameobject_template.sql
+++ b/sql/old/3.3.5a/2013_01_27_01_world_gameobject_template.sql
diff --git a/sql/updates/world/2013_01_28_00_world_gameobject.sql b/sql/old/3.3.5a/2013_01_28_00_world_gameobject.sql
index 3f49d799c62..3f49d799c62 100644
--- a/sql/updates/world/2013_01_28_00_world_gameobject.sql
+++ b/sql/old/3.3.5a/2013_01_28_00_world_gameobject.sql
diff --git a/sql/updates/world/2013_01_29_00_world_gameobject_loot_template.sql b/sql/old/3.3.5a/2013_01_29_00_world_gameobject_loot_template.sql
index 32146fb9ef8..32146fb9ef8 100644
--- a/sql/updates/world/2013_01_29_00_world_gameobject_loot_template.sql
+++ b/sql/old/3.3.5a/2013_01_29_00_world_gameobject_loot_template.sql
diff --git a/sql/updates/world/2013_01_29_01_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2013_01_29_01_world_achievement_criteria_data.sql
index 39627a943cc..39627a943cc 100644
--- a/sql/updates/world/2013_01_29_01_world_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2013_01_29_01_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2013_01_29_02_world_gameobject_loot_template.sql b/sql/old/3.3.5a/2013_01_29_02_world_gameobject_loot_template.sql
index c3f2d0f0fb9..c3f2d0f0fb9 100644
--- a/sql/updates/world/2013_01_29_02_world_gameobject_loot_template.sql
+++ b/sql/old/3.3.5a/2013_01_29_02_world_gameobject_loot_template.sql
diff --git a/sql/updates/world/2013_02_01_00_world_gameobject.sql b/sql/old/3.3.5a/2013_02_01_00_world_gameobject.sql
index 2476d623c5a..2476d623c5a 100644
--- a/sql/updates/world/2013_02_01_00_world_gameobject.sql
+++ b/sql/old/3.3.5a/2013_02_01_00_world_gameobject.sql
diff --git a/sql/updates/world/2013_02_01_01_world_spell_loot_template.sql b/sql/old/3.3.5a/2013_02_01_01_world_spell_loot_template.sql
index 0185f464412..0185f464412 100644
--- a/sql/updates/world/2013_02_01_01_world_spell_loot_template.sql
+++ b/sql/old/3.3.5a/2013_02_01_01_world_spell_loot_template.sql
diff --git a/sql/updates/world/2013_02_01_02_world_spell_script_names.sql b/sql/old/3.3.5a/2013_02_01_02_world_spell_script_names.sql
index 33b7b1fab6e..33b7b1fab6e 100644
--- a/sql/updates/world/2013_02_01_02_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2013_02_01_02_world_spell_script_names.sql
diff --git a/sql/updates/world/2013_02_01_03_world_wdbverified.sql b/sql/old/3.3.5a/2013_02_01_03_world_wdbverified.sql
index 1f47ff75825..1f47ff75825 100644
--- a/sql/updates/world/2013_02_01_03_world_wdbverified.sql
+++ b/sql/old/3.3.5a/2013_02_01_03_world_wdbverified.sql
diff --git a/sql/updates/world/2013_02_03_00_world_lfg_entrances.sql b/sql/old/3.3.5a/2013_02_03_00_world_lfg_entrances.sql
index e308c001d29..e308c001d29 100644
--- a/sql/updates/world/2013_02_03_00_world_lfg_entrances.sql
+++ b/sql/old/3.3.5a/2013_02_03_00_world_lfg_entrances.sql
diff --git a/sql/updates/auth/2013_02_04_00_auth_misc.sql b/sql/old/3.3.5a/2013_02_04_00_auth_misc.sql
index d8a508e4e7b..d8a508e4e7b 100644
--- a/sql/updates/auth/2013_02_04_00_auth_misc.sql
+++ b/sql/old/3.3.5a/2013_02_04_00_auth_misc.sql
diff --git a/sql/updates/world/2013_02_04_00_world_misc.sql b/sql/old/3.3.5a/2013_02_04_00_world_misc.sql
index ff8021653ab..ff8021653ab 100644
--- a/sql/updates/world/2013_02_04_00_world_misc.sql
+++ b/sql/old/3.3.5a/2013_02_04_00_world_misc.sql
diff --git a/sql/updates/auth/2013_02_04_01_auth_account.sql b/sql/old/3.3.5a/2013_02_04_01_auth_account.sql
index 9af73d41ee3..9af73d41ee3 100644
--- a/sql/updates/auth/2013_02_04_01_auth_account.sql
+++ b/sql/old/3.3.5a/2013_02_04_01_auth_account.sql
diff --git a/sql/updates/world/2013_02_04_01_world_creature_text.sql b/sql/old/3.3.5a/2013_02_04_01_world_creature_text.sql
index c52aa380c49..c52aa380c49 100644
--- a/sql/updates/world/2013_02_04_01_world_creature_text.sql
+++ b/sql/old/3.3.5a/2013_02_04_01_world_creature_text.sql
diff --git a/sql/updates/world/2013_02_04_02_world_misc.sql b/sql/old/3.3.5a/2013_02_04_02_world_misc.sql
index 300d0e31bcb..300d0e31bcb 100644
--- a/sql/updates/world/2013_02_04_02_world_misc.sql
+++ b/sql/old/3.3.5a/2013_02_04_02_world_misc.sql
diff --git a/sql/updates/world/2013_02_04_03_world_misc.sql b/sql/old/3.3.5a/2013_02_04_03_world_misc.sql
index a609d411b6e..a609d411b6e 100644
--- a/sql/updates/world/2013_02_04_03_world_misc.sql
+++ b/sql/old/3.3.5a/2013_02_04_03_world_misc.sql
diff --git a/sql/updates/world/2013_02_04_04_world_trinity_string.sql b/sql/old/3.3.5a/2013_02_04_04_world_trinity_string.sql
index 0a4ec437b28..0a4ec437b28 100644
--- a/sql/updates/world/2013_02_04_04_world_trinity_string.sql
+++ b/sql/old/3.3.5a/2013_02_04_04_world_trinity_string.sql
diff --git a/sql/updates/world/2013_02_04_05_world_spell_script_names.sql b/sql/old/3.3.5a/2013_02_04_05_world_spell_script_names.sql
index 4dd5ee52583..4dd5ee52583 100644
--- a/sql/updates/world/2013_02_04_05_world_spell_script_names.sql
+++ b/sql/old/3.3.5a/2013_02_04_05_world_spell_script_names.sql
diff --git a/sql/updates/world/2013_02_04_06_world_command.sql b/sql/old/3.3.5a/2013_02_04_06_world_command.sql
index fb36c512c4a..fb36c512c4a 100644
--- a/sql/updates/world/2013_02_04_06_world_command.sql
+++ b/sql/old/3.3.5a/2013_02_04_06_world_command.sql
diff --git a/sql/updates/world/2013_02_04_07_world_achievement_criteria_data.sql b/sql/old/3.3.5a/2013_02_04_07_world_achievement_criteria_data.sql
index dc873a02dfd..dc873a02dfd 100644
--- a/sql/updates/world/2013_02_04_07_world_achievement_criteria_data.sql
+++ b/sql/old/3.3.5a/2013_02_04_07_world_achievement_criteria_data.sql
diff --git a/sql/updates/world/2013_02_04_08_world_creature_template.sql b/sql/old/3.3.5a/2013_02_04_08_world_creature_template.sql
index 3dd365366b6..3dd365366b6 100644
--- a/sql/updates/world/2013_02_04_08_world_creature_template.sql
+++ b/sql/old/3.3.5a/2013_02_04_08_world_creature_template.sql
diff --git a/sql/updates/auth/2013_02_05_00_auth_account.sql b/sql/old/3.3.5a/2013_02_05_00_auth_account.sql
index 2f32c5e3e3e..2f32c5e3e3e 100644
--- a/sql/updates/auth/2013_02_05_00_auth_account.sql
+++ b/sql/old/3.3.5a/2013_02_05_00_auth_account.sql
diff --git a/sql/updates/world/2013_02_05_00_world_disables.sql b/sql/old/3.3.5a/2013_02_05_00_world_disables.sql
index b7e9be4e3c7..b7e9be4e3c7 100644
--- a/sql/updates/world/2013_02_05_00_world_disables.sql
+++ b/sql/old/3.3.5a/2013_02_05_00_world_disables.sql
diff --git a/sql/updates/world/2013_02_05_01_world_item_template.sql b/sql/old/3.3.5a/2013_02_05_01_world_item_template.sql
index aea09e60e58..aea09e60e58 100644
--- a/sql/updates/world/2013_02_05_01_world_item_template.sql
+++ b/sql/old/3.3.5a/2013_02_05_01_world_item_template.sql
diff --git a/sql/updates/world/2013_02_06_00_world_disables.sql b/sql/old/3.3.5a/2013_02_06_00_world_disables.sql
index 0785330d7fd..0785330d7fd 100644
--- a/sql/updates/world/2013_02_06_00_world_disables.sql
+++ b/sql/old/3.3.5a/2013_02_06_00_world_disables.sql
diff --git a/sql/updates/world/2013_02_06_01_world_misc.sql b/sql/old/3.3.5a/2013_02_06_01_world_misc.sql
index 1a59c75ff1b..1a59c75ff1b 100644
--- a/sql/updates/world/2013_02_06_01_world_misc.sql
+++ b/sql/old/3.3.5a/2013_02_06_01_world_misc.sql
diff --git a/sql/updates/auth/2013_02_07_00_auth_account.sql b/sql/old/3.3.5a/2013_02_07_00_auth_account.sql
index 03bdf8cdcd5..03bdf8cdcd5 100644
--- a/sql/updates/auth/2013_02_07_00_auth_account.sql
+++ b/sql/old/3.3.5a/2013_02_07_00_auth_account.sql
diff --git a/sql/updates/world/2013_02_07_00_world_areatrigger_teleport.sql b/sql/old/3.3.5a/2013_02_07_00_world_areatrigger_teleport.sql
index 0b6f3e576b4..0b6f3e576b4 100644
--- a/sql/updates/world/2013_02_07_00_world_areatrigger_teleport.sql
+++ b/sql/old/3.3.5a/2013_02_07_00_world_areatrigger_teleport.sql
diff --git a/sql/updates/auth/2013_02_08_00_auth_account.sql b/sql/old/3.3.5a/2013_02_08_00_auth_account.sql
index 49948781444..49948781444 100644
--- a/sql/updates/auth/2013_02_08_00_auth_account.sql
+++ b/sql/old/3.3.5a/2013_02_08_00_auth_account.sql
diff --git a/sql/updates/world/2013_02_09_00_world_gameobject.sql b/sql/old/3.3.5a/2013_02_09_00_world_gameobject.sql
index 386ca974e99..386ca974e99 100644
--- a/sql/updates/world/2013_02_09_00_world_gameobject.sql
+++ b/sql/old/3.3.5a/2013_02_09_00_world_gameobject.sql
diff --git a/sql/updates/world/2013_02_09_01_world_creature_equip_template.sql b/sql/old/3.3.5a/2013_02_09_01_world_creature_equip_template.sql
index fd207746ac1..fd207746ac1 100644
--- a/sql/updates/world/2013_02_09_01_world_creature_equip_template.sql
+++ b/sql/old/3.3.5a/2013_02_09_01_world_creature_equip_template.sql
diff --git a/sql/updates/world/2013_02_09_02_world_areatrigger_teleport.sql b/sql/old/3.3.5a/2013_02_09_02_world_areatrigger_teleport.sql
index 2a0c1682e32..2a0c1682e32 100644
--- a/sql/updates/world/2013_02_09_02_world_areatrigger_teleport.sql
+++ b/sql/old/3.3.5a/2013_02_09_02_world_areatrigger_teleport.sql
diff --git a/sql/updates/world/2013_02_09_03_world_player_factionchange_spells.sql b/sql/old/3.3.5a/2013_02_09_03_world_player_factionchange_spells.sql
index 22f69b11aaa..22f69b11aaa 100644
--- a/sql/updates/world/2013_02_09_03_world_player_factionchange_spells.sql
+++ b/sql/old/3.3.5a/2013_02_09_03_world_player_factionchange_spells.sql
diff --git a/sql/updates/world/2013_02_10_00_world_areatrigger_teleport.sql b/sql/old/3.3.5a/2013_02_10_00_world_areatrigger_teleport.sql
index b5f5c856fe0..b5f5c856fe0 100644
--- a/sql/updates/world/2013_02_10_00_world_areatrigger_teleport.sql
+++ b/sql/old/3.3.5a/2013_02_10_00_world_areatrigger_teleport.sql
diff --git a/sql/updates/world/2013_02_11_00_world_creature_template.sql b/sql/old/3.3.5a/2013_02_11_00_world_creature_template.sql
index dbbc7267780..dbbc7267780 100644
--- a/sql/updates/world/2013_02_11_00_world_creature_template.sql
+++ b/sql/old/3.3.5a/2013_02_11_00_world_creature_template.sql
diff --git a/sql/updates/world/2013_02_14_00_world_version.sql b/sql/updates/world/2013_02_14_00_world_version.sql
new file mode 100644
index 00000000000..b3186b9c4e6
--- /dev/null
+++ b/sql/updates/world/2013_02_14_00_world_version.sql
@@ -0,0 +1 @@
+UPDATE `version` SET `db_version`='TDB 335.51', `cache_id`=51 LIMIT 1;
diff --git a/sql/updates/world/2013_02_15_00_world_waypoint_data.sql b/sql/updates/world/2013_02_15_00_world_waypoint_data.sql
new file mode 100644
index 00000000000..555cbd506e8
--- /dev/null
+++ b/sql/updates/world/2013_02_15_00_world_waypoint_data.sql
@@ -0,0 +1,20 @@
+SET @NPC_DRAKE  := 29709;
+
+DELETE FROM `waypoint_data` WHERE `id`=@NPC_DRAKE;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@NPC_DRAKE,1,7294.96,-2418.733,823.869,0,0,0,0,100,0),
+(@NPC_DRAKE,2,7315.984,-2331.46,826.3972,0,0,0,0,100,0),
+(@NPC_DRAKE,3,7271.826,-2271.479,833.5917,0,0,0,0,100,0),
+(@NPC_DRAKE,4,7186.253,-2218.475,847.5632,0,0,0,0,100,0),
+(@NPC_DRAKE,5,7113.195,-2164.288,850.2301,0,0,0,0,100,0),
+(@NPC_DRAKE,6,7078.018,-2063.106,854.7581,0,0,0,0,100,0),
+(@NPC_DRAKE,7,7073.221,-1983.382,861.9246,0,0,0,0,100,0),
+(@NPC_DRAKE,8,7061.455,-1885.899,865.119,0,0,0,0,100,0),
+(@NPC_DRAKE,9,7033.32,-1826.775,876.2578,0,0,0,0,100,0),
+(@NPC_DRAKE,10,6999.902,-1784.012,897.4521,0,0,0,0,100,0),
+(@NPC_DRAKE,11,6954.913,-1747.043,897.4521,0,0,0,0,100,0),
+(@NPC_DRAKE,12,6933.856,-1720.698,882.2022,0,0,0,0,100,0),
+(@NPC_DRAKE,13,6932.729,-1687.306,866.1189,0,0,0,0,100,0),
+(@NPC_DRAKE,14,6952.458,-1663.802,849.8133,0,0,0,0,100,0),
+(@NPC_DRAKE,15,7002.819,-1651.681,831.397,0,0,0,0,100,0),
+(@NPC_DRAKE,16,7026.531,-1649.239,828.8406,0,0,0,0,100,0);
diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp
index dae2ffd36f6..d9528446bcf 100644
--- a/src/server/scripts/Northrend/zone_storm_peaks.cpp
+++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp
@@ -356,34 +356,20 @@ public:
 
 enum FreedProtoDrake
 {
+    NPC_DRAKE                           = 29709,
+
     AREA_VALLEY_OF_ANCIENT_WINTERS      = 4437,
+
     TEXT_EMOTE                          = 0,
+
     SPELL_KILL_CREDIT_PRISONER          = 55144,
     SPELL_SUMMON_LIBERATED              = 55073,
-    SPELL_KILL_CREDIT_DRAKE             = 55143
-};
+    SPELL_KILL_CREDIT_DRAKE             = 55143,
 
-const Position FreedDrakeWaypoints[16] =
-{
-    {7294.96f, -2418.733f, 823.869f, 0.0f},
-    {7315.984f, -2331.46f, 826.3972f, 0.0f},
-    {7271.826f, -2271.479f, 833.5917f, 0.0f},
-    {7186.253f, -2218.475f, 847.5632f, 0.0f},
-    {7113.195f, -2164.288f, 850.2301f, 0.0f},
-    {7078.018f, -2063.106f, 854.7581f, 0.0f},
-    {7073.221f, -1983.382f, 861.9246f, 0.0f},
-    {7061.455f, -1885.899f, 865.119f, 0.0f},
-    {7033.32f, -1826.775f, 876.2578f, 0.0f},
-    {6999.902f, -1784.012f, 897.4521f, 0.0f},
-    {6954.913f, -1747.043f, 897.4521f, 0.0f},
-    {6933.856f, -1720.698f, 882.2022f, 0.0f},
-    {6932.729f, -1687.306f, 866.1189f, 0.0f},
-    {6952.458f, -1663.802f, 849.8133f, 0.0f},
-    {7002.819f, -1651.681f, 831.397f, 0.0f},
-    {7026.531f, -1649.239f, 828.8406f, 0.0f}
+    EVENT_CHECK_AREA                    = 1,
+    EVENT_REACHED_HOME                  = 2,
 };
 
-
 class npc_freed_protodrake : public CreatureScript
 {
 public:
@@ -393,74 +379,60 @@ public:
     {
         npc_freed_protodrakeAI(Creature* creature) : VehicleAI(creature) {}
 
-        bool autoMove;
-        bool wpReached;
-        uint16 CheckTimer;
-        uint16 countWP;
+        EventMap events;
 
         void Reset()
         {
-            autoMove = false;
-            wpReached = false;
-            CheckTimer = 5000;
-            countWP = 0;
+            events.ScheduleEvent(EVENT_CHECK_AREA, 5000);
         }
 
         void MovementInform(uint32 type, uint32 id)
         {
-            if (type != POINT_MOTION_TYPE)
+            if (type != WAYPOINT_MOTION_TYPE)
                 return;
 
-            if (id < 15)
-            {
-                ++countWP;
-                wpReached = true;
-            }
-            else
+            if (id == 15)
             // drake reached village
-            {
-                // get player that rides drake (from seat 0)
-                Unit* player = me->GetVehicleKit()->GetPassenger(0);
-                if (player && player->GetTypeId() == TYPEID_PLAYER)
-                {
-                    // for each prisoner on drake, give credit
-                    for (uint8 i = 1; i < 4; ++i)
-                        if (Unit* prisoner = me->GetVehicleKit()->GetPassenger(i))
-                        {
-                            if (prisoner->GetTypeId() != TYPEID_UNIT)
-                                return;
-                            prisoner->CastSpell(player, SPELL_KILL_CREDIT_PRISONER, true);
-                            prisoner->CastSpell(prisoner, SPELL_SUMMON_LIBERATED, true);
-                            prisoner->ExitVehicle();
-                        }
-                    me->CastSpell(me, SPELL_KILL_CREDIT_DRAKE, true);
-                    player->ExitVehicle();
-                }
-            }
+            events.ScheduleEvent(EVENT_REACHED_HOME, 2000);
         }
 
         void UpdateAI(const uint32 diff)
         {
-            if (!autoMove)
+            events.Update(diff);
+
+            switch (events.ExecuteEvent())
             {
-                if (CheckTimer < diff)
-                {
-                    CheckTimer = 5000;
+                case EVENT_CHECK_AREA:
                     if (me->GetAreaId() == AREA_VALLEY_OF_ANCIENT_WINTERS)
                     {
-                        Talk(TEXT_EMOTE, me->GetVehicleKit()->GetPassenger(0)->GetGUID());
-                        autoMove = true;
-                        wpReached = true;
+                        if (Vehicle* vehicle = me->GetVehicleKit())
+                            if (Unit* passenger = vehicle->GetPassenger(0))
+                            {
+                                Talk(TEXT_EMOTE, passenger->GetGUID());
+                                me->GetMotionMaster()->MovePath(NPC_DRAKE, false);
+                            }
                     }
-                }
-                else
-                    CheckTimer -= diff;
-            }
-
-            if (wpReached && autoMove)
-            {
-                wpReached = false;
-                me->GetMotionMaster()->MovePoint(countWP, FreedDrakeWaypoints[countWP]);
+                    else
+                        events.ScheduleEvent(EVENT_CHECK_AREA, 5000);
+                    break;
+                case EVENT_REACHED_HOME:
+                    Unit* player = me->GetVehicleKit()->GetPassenger(0);
+                    if (player && player->GetTypeId() == TYPEID_PLAYER)
+                    {
+                        // for each prisoner on drake, give credit
+                        for (uint8 i = 1; i < 4; ++i)
+                            if (Unit* prisoner = me->GetVehicleKit()->GetPassenger(i))
+                            {
+                                if (prisoner->GetTypeId() != TYPEID_UNIT)
+                                    return;
+                                prisoner->CastSpell(player, SPELL_KILL_CREDIT_PRISONER, true);
+                                prisoner->CastSpell(prisoner, SPELL_SUMMON_LIBERATED, true);
+                                prisoner->ExitVehicle();
+                            }
+                        me->CastSpell(me, SPELL_KILL_CREDIT_DRAKE, true);
+                        player->ExitVehicle();
+                    }
+                    break;
             }
         }
     };