Commit df580bf5 authored by Melledy's avatar Melledy
Browse files

Fixed issue with scene groups after merge

parent 81183db1
...@@ -15,7 +15,7 @@ import java.util.List; ...@@ -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 { ...@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment