Better cleanup for Christmas and all events

1 files changed, 17 insertions, 4 deletions

diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index f423e41c1..2ed3368c9 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -120,18 +120,31 @@ function	script	GlobalEventMenu	{
 
     // WARNING, possibly dangerous.
     function sClear {
-        // Delete all Easter Stuff from every player
+        // Delete all event-only item from every player
         DelItemFromEveryPlayer(GoldenEasteregg);
         DelItemFromEveryPlayer(GoldenEasteregg);
+        DelItemFromEveryPlayer(ClosedChristmasBox);
+        DelItemFromEveryPlayer(OpenedChristmasBox);
 
         // Delete all Christmas stuff
         if ($EVENT$ != "Christmas") {
             $XMAS_MONEY=0; // Golbarez
             $XMAS_GIFTS=0; // Chief
+        } else if ($EVENT$ == "Christmas") {
+            DelAccRegFromEveryPlayer("#XMAS_LOGINBONUS");
+            removemapmask "003-1", MASK_CHRISTMAS;
+            removemapmask "005-1", MASK_CHRISTMAS;
+            removemapmask "009-1", MASK_CHRISTMAS;
+            removemapmask "012-1", MASK_CHRISTMAS;
+            removemapmask "017-2", MASK_CHRISTMAS;
+            removemapmask "017-2-1", MASK_CHRISTMAS;
+            removemapmask "017-3", MASK_CHRISTMAS;
+            removemapmask "020-2", MASK_CHRISTMAS;
         }
-        DelItemFromEveryPlayer(ClosedChristmasBox);
-        DelItemFromEveryPlayer(OpenedChristmasBox);
-        DelAccRegFromEveryPlayer("#XMAS_LOGINBONUS");
+
+        // We must remove any event drop
+        charcommand("@reloadmobdb");
+        SeasonReload(1);
     }