summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-01-07 22:01:09 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2013-01-07 22:01:09 +0100
commit88a138a5cdc0b23c90b9e49969fd2709b2163790 (patch)
tree2c9b70d277aa3f75f26cdca3e462f921f176b7bf
parent0c3d778dd1f266648f512922793febe598c971bd (diff)
downloadserverdata-88a138a5cdc0b23c90b9e49969fd2709b2163790.tar.gz
serverdata-88a138a5cdc0b23c90b9e49969fd2709b2163790.tar.bz2
serverdata-88a138a5cdc0b23c90b9e49969fd2709b2163790.tar.xz
serverdata-88a138a5cdc0b23c90b9e49969fd2709b2163790.zip
Disable Christmas event scripts and remove Christmas tree from Nivalis.
m---------client-data0
-rw-r--r--world/map/data/020-1.wlkbin18948 -> 18948 bytes
-rw-r--r--world/map/npc/scripts.conf2
3 files changed, 1 insertions, 1 deletions
diff --git a/client-data b/client-data
-Subproject fc50cbb9ff5d892b98f1c0247245a3ffe67e78d
+Subproject 83d10f0866fb973c3f20823f05fa85ec49c8760
diff --git a/world/map/data/020-1.wlk b/world/map/data/020-1.wlk
index fc4eec16..06b8f6dd 100644
--- a/world/map/data/020-1.wlk
+++ b/world/map/data/020-1.wlk
Binary files differ
diff --git a/world/map/npc/scripts.conf b/world/map/npc/scripts.conf
index 77e74333..48712aca 100644
--- a/world/map/npc/scripts.conf
+++ b/world/map/npc/scripts.conf
@@ -101,4 +101,4 @@ import: npc/halloween/2011/_import.txt
// import: npc/easter/2012/_import.txt
// Christmas 2012
-import: npc/xmas/2012/_import.txt
+// import: npc/xmas/2012/_import.txt