summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-01-04 21:21:52 -0200
committerJesusaves <cpntb1@ymail.com>2019-01-04 21:21:52 -0200
commit831bd5ef2deeb246a07e1670ce933fb228921e2a (patch)
treedaf13ae1a97dc16cf2b6195d707a5f7e51601d74
parent13313a1c371233038a381169042bf016e81c7886 (diff)
downloadserverdata-831bd5ef2deeb246a07e1670ce933fb228921e2a.tar.gz
serverdata-831bd5ef2deeb246a07e1670ce933fb228921e2a.tar.bz2
serverdata-831bd5ef2deeb246a07e1670ce933fb228921e2a.tar.xz
serverdata-831bd5ef2deeb246a07e1670ce933fb228921e2a.zip
Do not reset XMAS_MONEY or XMAS_GIFTS when Christmas event end, we still need them
-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: