Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-15 08:25:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nazrin
2023-06-16 11:04:58 -07:00
committed by GitHub
parent 89376d58bf
commit 6da5343df0
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/emu/grasscutter/game/quest/exec/ExecRefreshGroupSuite.java
View File

@@ -25,6 +25,7 @@ public class ExecRefreshGroupSuite extends QuestExecHandler {
if (!scriptManager.refreshGroupSuite(groupId, suiteId, quest)) { if (!scriptManager.refreshGroupSuite(groupId, suiteId, quest)) {
result = false; result = false;
} }
scriptManager.getGroupById(groupId).dontUnload = true;
} }
return result; return result;

2
src/main/java/emu/grasscutter/game/world/Scene.java
View File

@@ -838,7 +838,7 @@ public final class Scene {
.collect(Collectors.toSet()); .collect(Collectors.toSet());
for (var group : this.loadedGroups) { 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); unloadGroup(scriptManager.getBlocks().get(group.block_id), group.id);
} }

4
src/main/java/emu/grasscutter/scripts/SceneScriptManager.java
View File

@@ -266,7 +266,8 @@ public class SceneScriptManager {
suiteId, suiteId,
groupId, groupId,
getScene().getId()); getScene().getId());
} else { if (targetGroupInstance == null) return false;
}
Grasscutter.getLogger().debug("Refreshing group {} suite {}", groupId, suiteId); Grasscutter.getLogger().debug("Refreshing group {} suite {}", groupId, suiteId);
suiteId = suiteId =
refreshGroup( refreshGroup(
@@ -274,7 +275,6 @@ public class SceneScriptManager {
suiteId, suiteId,
false); // If suiteId is zero, the value of suiteId changes false); // If suiteId is zero, the value of suiteId changes
scene.broadcastPacket(new PacketGroupSuiteNotify(groupId, suiteId)); scene.broadcastPacket(new PacketGroupSuiteNotify(groupId, suiteId));
}
return true; return true;
} }

1
src/main/java/emu/grasscutter/scripts/data/SceneGroup.java
View File

@@ -40,6 +40,7 @@ public final class SceneGroup {
public SceneGarbage garbages; public SceneGarbage garbages;
public SceneInitConfig init_config; public SceneInitConfig init_config;
@Getter public boolean dynamic_load = false; @Getter public boolean dynamic_load = false;
public boolean dontUnload = false;
public SceneReplaceable is_replaceable; public SceneReplaceable is_replaceable;