From 831bd5ef2deeb246a07e1670ce933fb228921e2a Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 4 Jan 2019 21:21:52 -0200
Subject: Do not reset XMAS_MONEY or XMAS_GIFTS when Christmas event end, we
 still need them

---
 npc/commands/event.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'npc/commands/event.txt')

diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index f6c99a8a1..f423e41c1 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -125,10 +125,12 @@ function	script	GlobalEventMenu	{
         DelItemFromEveryPlayer(GoldenEasteregg);
 
         // Delete all Christmas stuff
+        if ($EVENT$ != "Christmas") {
+            $XMAS_MONEY=0; // Golbarez
+            $XMAS_GIFTS=0; // Chief
+        }
         DelItemFromEveryPlayer(ClosedChristmasBox);
         DelItemFromEveryPlayer(OpenedChristmasBox);
-        $XMAS_MONEY=0; // Golbarez
-        $XMAS_GIFTS=0; // Chief
         DelAccRegFromEveryPlayer("#XMAS_LOGINBONUS");
     }
 
@@ -162,7 +164,7 @@ function	script	GlobalEventMenu	{
             l("Reset Kill Saulc Event (Monthly)"), -;
 
         switch (@menu) {
-            case 1: set $EVENT$, ""; sClear(); logmes "Disabled events.", LOGMES_ATCOMMAND;
+            case 1: sClear(); set $EVENT$, ""; logmes "Disabled events.", LOGMES_ATCOMMAND;
                 break;
             case 2: sEaster(); break;
             case 3:
-- 
cgit v1.2.3-60-g2f50