Apply changes from #63 (Anime-Game-Servers/Grasscutter-Quests)

2025-12-22 20:04:56 +01:00 · 2023-04-23 22:51:08 -04:00
parent d608831594
commit c9d6225194
20 changed files with 893 additions and 460 deletions
--- a/src/main/java/emu/grasscutter/game/activity/ActivityHandler.java
+++ b/src/main/java/emu/grasscutter/game/activity/ActivityHandler.java
@@ -71,11 +71,11 @@ public abstract class ActivityHandler {
                .forEach(
                        condGroupId -> {
                            var condGroup = GameData.getActivityCondGroupMap().get((int) condGroupId);
-                            condGroup
-                                    .getCondIds()
-                                    .forEach(
-                                            condition ->
-                                                    questManager.queueEvent(QuestCond.QUEST_COND_ACTIVITY_COND, condition));
+                            if (condGroup != null) condGroup
+                                .getCondIds()
+                                .forEach(
+                                    condition ->
+                                        questManager.queueEvent(QuestCond.QUEST_COND_ACTIVITY_COND, condition));
                        });
    }