From 957d3a9ac39a83fe0fd09fb5e0414d3ce2d03c54 Mon Sep 17 00:00:00 2001 From: Melledy <121644117+Melledy@users.noreply.github.com> Date: Wed, 24 Dec 2025 21:16:12 -0800 Subject: [PATCH] Remove activities that are not in the activity module --- .../java/emu/nebula/game/activity/ActivityManager.java | 8 ++++++++ .../java/emu/nebula/game/activity/ActivityModule.java | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/emu/nebula/game/activity/ActivityManager.java b/src/main/java/emu/nebula/game/activity/ActivityManager.java index efd283c..f9a63e8 100644 --- a/src/main/java/emu/nebula/game/activity/ActivityManager.java +++ b/src/main/java/emu/nebula/game/activity/ActivityManager.java @@ -68,6 +68,14 @@ public class ActivityManager extends PlayerManager implements GameDatabaseObject if (data == null) { it.remove(); this.queueSave = true; + continue; + } + + // Remove activities that are not in the activity module + if (!Nebula.getGameContext().getActivityModule().getActivities().contains(activity.getId())) { + it.remove(); + this.queueSave = true; + continue; } // Set data diff --git a/src/main/java/emu/nebula/game/activity/ActivityModule.java b/src/main/java/emu/nebula/game/activity/ActivityModule.java index 5600903..3bd49dd 100644 --- a/src/main/java/emu/nebula/game/activity/ActivityModule.java +++ b/src/main/java/emu/nebula/game/activity/ActivityModule.java @@ -20,8 +20,6 @@ public class ActivityModule extends GameContextModule { // Trial activities this.activities.add(700105); this.activities.add(700106); - this.activities.add(700107); - this.activities.add(700108); // Tower defense activity this.activities.add(102001);