summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2014-11-02 19:55:33 -0600
committerwushin <pasekei@gmail.com>2014-11-02 19:55:33 -0600
commit8e2ef9fa67e076c5aa3be8c759e17f27c873a9b4 (patch)
tree8d885abc244f95c9a4e924e1810c3518836a6ec0 /world/map
parente0107f44ce41a6e130030cef2f79748cdf67b250 (diff)
downloadserverdata-8e2ef9fa67e076c5aa3be8c759e17f27c873a9b4.tar.gz
serverdata-8e2ef9fa67e076c5aa3be8c759e17f27c873a9b4.tar.bz2
serverdata-8e2ef9fa67e076c5aa3be8c759e17f27c873a9b4.tar.xz
serverdata-8e2ef9fa67e076c5aa3be8c759e17f27c873a9b4.zip
Fix Halloween timing
Diffstat (limited to 'world/map')
-rw-r--r--world/map/npc/annuals/halloween/config.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/world/map/npc/annuals/halloween/config.txt b/world/map/npc/annuals/halloween/config.txt
index a3d5fd58..7405a1c0 100644
--- a/world/map/npc/annuals/halloween/config.txt
+++ b/world/map/npc/annuals/halloween/config.txt
@@ -337,6 +337,8 @@ L_Main:
if (gettime(6) == $@halloween_reward_start_month)
set $@halloween_min_age, ((gettime(5) + 38)*86400);
+ if(gettime(6) <= $@halloween_end_month && gettime(5) > $@halloween_reward_end_day)
+ goto L_NoEventTime;
if((gettime(6) == $@halloween_reward_start_month && gettime(5) >= $@halloween_reward_start_day
&& (gettime(5) <= $@halloween_reward_end_day && $@halloween_reward_start_month == $@halloween_end_month
|| !($@halloween_reward_start_month == $@halloween_end_month)))