Do not unload groups asked for by quests (#2212)

Grasscutters · Jun 16, 2023 · 6da5343 · 6da5343
1 parent 89376d5
commit 6da5343
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/src/main/java/emu/grasscutter/game/quest/exec/ExecRefreshGroupSuite.java b/src/main/java/emu/grasscutter/game/quest/exec/ExecRefreshGroupSuite.java
@@ -25,6 +25,7 @@ public boolean execute(GameQuest quest, QuestData.QuestExecParam condition, Stri
             if (!scriptManager.refreshGroupSuite(groupId, suiteId, quest)) {
                 result = false;
             }
+            scriptManager.getGroupById(groupId).dontUnload = true;
         }
 
         return result;

diff --git a/src/main/java/emu/grasscutter/game/world/Scene.java b/src/main/java/emu/grasscutter/game/world/Scene.java
@@ -838,7 +838,7 @@ public void checkGroups() {
                         .collect(Collectors.toSet());
 
         for (var group : this.loadedGroups) {
-            if (!visible.contains(group.id) && !group.dynamic_load)
+            if (!visible.contains(group.id) && !group.dynamic_load && !group.dontUnload)
                 unloadGroup(scriptManager.getBlocks().get(group.block_id), group.id);
         }
 

diff --git a/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java b/src/main/java/emu/grasscutter/scripts/SceneScriptManager.java
@@ -266,15 +266,15 @@ public boolean refreshGroupSuite(int groupId, int suiteId) {
                             suiteId,
                             groupId,
                             getScene().getId());
-        } else {
-            Grasscutter.getLogger().debug("Refreshing group {} suite {}", groupId, suiteId);
-            suiteId =
-                    refreshGroup(
-                            targetGroupInstance,
-                            suiteId,
-                            false); // If suiteId is zero, the value of suiteId changes
-            scene.broadcastPacket(new PacketGroupSuiteNotify(groupId, suiteId));
+            if (targetGroupInstance == null) return false;
         }
+        Grasscutter.getLogger().debug("Refreshing group {} suite {}", groupId, suiteId);
+        suiteId =
+                refreshGroup(
+                        targetGroupInstance,
+                        suiteId,
+                        false); // If suiteId is zero, the value of suiteId changes
+        scene.broadcastPacket(new PacketGroupSuiteNotify(groupId, suiteId));
 
         return true;
     }

diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneGroup.java b/src/main/java/emu/grasscutter/scripts/data/SceneGroup.java
@@ -40,6 +40,7 @@ public final class SceneGroup {
     public SceneGarbage garbages;
     public SceneInitConfig init_config;
     @Getter public boolean dynamic_load = false;
+    public boolean dontUnload = false;
 
     public SceneReplaceable is_replaceable;