summaryrefslogtreecommitdiff
path: root/npc/commands
diff options
context:
space:
mode:
Diffstat (limited to 'npc/commands')
-rw-r--r--npc/commands/event.txt8
1 files changed, 5 insertions, 3 deletions
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: