From 233d7dfc487303afc48eae2f9e99f08f10e3cf80 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sun, 10 Oct 2021 23:24:09 -0300
Subject: Prevent a rare theoretical bug where Thanksgiving could end before
 the Aeros Event

---
 npc/functions/event.txt | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'npc')

diff --git a/npc/functions/event.txt b/npc/functions/event.txt
index 7ba1e802c..a627788de 100644
--- a/npc/functions/event.txt
+++ b/npc/functions/event.txt
@@ -369,11 +369,6 @@ OnInit:
     .score=0;
     .event=0;
 OnTimer90000:
-    if ($EVENT$ != "Thanksgiving")
-        end;
-    .users=getusers(1);
-    .score+=.users;
-
     // Abort event and reset score
     if (.event && .event < gettimetick(2)) {
         .event=0;
@@ -385,6 +380,18 @@ OnTimer90000:
         announce ("The event is over!"), bc_all|bc_npc;
     }
 
+    // Skip processment until current event ends
+    if (.event) {
+        initnpctimer;
+        end;
+    }
+
+    // Stop counting or update scores
+    if ($EVENT$ != "Thanksgiving")
+        end;
+    .users=getusers(1);
+    .score+=.users;
+
     // Do event (lasts 30 minutes)
     if (!.event && !$@MK_SCENE && .score > 300 && .users > 3) {
         /* Reserve Aeros */
-- 
cgit v1.2.3-60-g2f50