Merge.

--HG--
branch : trunk

1 files changed, 9 insertions, 0 deletions

diff --git a/sql/updates/636_world_scripts.sql b/sql/updates/636_world_scripts.sql
new file mode 100644
index 00000000000..5527d639fb2
--- /dev/null
+++ b/sql/updates/636_world_scripts.sql
@@ -0,0 +1,9 @@
+-- event script for Medivh's Journal
+delete from event_scripts where id = 10951;
+insert into event_scripts values
+(10951,0,10,17651, 300000, 0,-11159,-1907.22,91.48,0);
+
+-- remove every Image from Medivh (should not be spawned by db)
+delete from creature where id = 17651;
+-- add script
+update creature_template set scriptname = 'npc_image_of_medivh' where entry = 17651;
\ No newline at end of file