From 14231b3ba4e0b7540ff671d9114ff8a10aa59f22 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Tue, 1 Jan 2019 11:24:09 -0200
Subject: [XMAS 18] Urgent fixes

---
 npc/019-4-1/chief.txt | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'npc/019-4-1/chief.txt')

diff --git a/npc/019-4-1/chief.txt b/npc/019-4-1/chief.txt
index a8beecd45..58136e529 100644
--- a/npc/019-4-1/chief.txt
+++ b/npc/019-4-1/chief.txt
@@ -42,17 +42,19 @@
         next;
     }
 
+    // Start Event for the first time
+    if (gettime(GETTIME_MONTH) != JANUARY && getq(SQuest_Christmas) < gettime(GETTIME_YEAR))
+        setq SQuest_Christmas, gettime(GETTIME_YEAR), 0, 0;
+    if (gettime(GETTIME_MONTH) == JANUARY && getq(SQuest_Christmas) != gettime(GETTIME_YEAR)-1)
+        setq SQuest_Christmas, gettime(GETTIME_YEAR), 0, 0;
+    // Christmas still running
+    if ($EVENT$ == "Christmas")
+        goto L_Main;
     // Last year
     if (getq(SQuest_Christmas) == gettime(GETTIME_YEAR)-1)
         goto L_Reward;
-    // Not on season
-    if ($EVENT$ != "Christmas")
-        goto L_OutOfSeason;
-    // Start Event for the first time
-    if (getq(SQuest_Christmas) < gettime(GETTIME_YEAR))
-        setq SQuest_Christmas, gettime(GETTIME_YEAR), 0, 0;
-    // Main Loop
-    goto L_Main;
+    // Not in season
+    goto L_OutOfSeason;
 
 L_OutOfSeason:
     mesn;
-- 
cgit v1.2.3-60-g2f50