*Merge. (4s rule while drinking in arena skipped because i do not know how to merge it)

--HG--
branch : trunk

3 files changed, 7 insertions, 0 deletions

diff --git a/sql/updates/919_world.sql b/sql/updates/919_world.sql
new file mode 100644
index 00000000000..7aa9fa363e6
--- /dev/null
+++ b/sql/updates/919_world.sql
@@ -0,0 +1,3 @@
+ALTER TABLE version
+   ADD `core_revision` varchar(120) AFTER `core_version`;
+
diff --git a/sql/updates/TC1_1534_world.sql b/sql/updates/TC1_1534_world.sql
new file mode 100644
index 00000000000..cd80a785278
--- /dev/null
+++ b/sql/updates/TC1_1534_world.sql
@@ -0,0 +1,3 @@
+UPDATE `creature_template` SET `ScriptName` = 'mob_ethereal_apprentice' WHERE `entry` = 18430;
+
+DELETE FROM `creature` WHERE `id` = 18431;
diff --git a/sql/world_scripts_full.sql b/sql/world_scripts_full.sql
index eef3a367c6a..69791270a41 100644
--- a/sql/world_scripts_full.sql
+++ b/sql/world_scripts_full.sql
@@ -131,6 +131,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_ruul_snowhoof' WHERE `entry`=12
 UPDATE `creature_template` SET `ScriptName`='boss_pandemonius' WHERE `entry`=18341;
 UPDATE `creature_template` SET `ScriptName`='boss_nexusprince_shaffar' WHERE `entry`=18344;
 UPDATE `creature_template` SET `ScriptName`='mob_ethereal_beacon' WHERE `entry`=18431;
+UPDATE `creature_template` SET `ScriptName`='mob_ethereal_apprentice' WHERE `entry`=18430;
 
 /* AUCHENAI CRYPTS */
 UPDATE `creature_template` SET `ScriptName`='boss_exarch_maladaar' WHERE `entry`=18373;