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

Fixed issue with scene groups after merge

Browse Source
This commit is contained in:
Melledy
2022-05-16 22:09:10 -07:00
parent 81183db104
commit df580bf519
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static emu.grasscutter.Configuration.SCRIPTS_FOLDER; import static emu.grasscutter.Configuration.*;
@ToString @ToString
@Setter @Setter
@@ -68,7 +68,7 @@ public class SceneGroup {
setLoaded(true); setLoaded(true);
CompiledScript cs = ScriptLoader.getScriptByPath( CompiledScript cs = ScriptLoader.getScriptByPath(
SCRIPTS_FOLDER + "Scene/" + sceneId + "/scene" + sceneId + "_group" + id + "." + ScriptLoader.getScriptType()); SCRIPT("Scene/" + sceneId + "/scene" + sceneId + "_group" + id + "." + ScriptLoader.getScriptType()));
if (cs == null) { if (cs == null) {
return this; return this;