From df580bf51908103c18e2e2a92ad33e3322ef10ca Mon Sep 17 00:00:00 2001 From: Melledy <52122272+Melledy@users.noreply.github.com> Date: Mon, 16 May 2022 22:09:10 -0700 Subject: [PATCH] Fixed issue with scene groups after merge --- src/main/java/emu/grasscutter/scripts/data/SceneGroup.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneGroup.java b/src/main/java/emu/grasscutter/scripts/data/SceneGroup.java index 82efb1969..08766b763 100644 --- a/src/main/java/emu/grasscutter/scripts/data/SceneGroup.java +++ b/src/main/java/emu/grasscutter/scripts/data/SceneGroup.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static emu.grasscutter.Configuration.SCRIPTS_FOLDER; +import static emu.grasscutter.Configuration.*; @ToString @Setter @@ -68,7 +68,7 @@ public class SceneGroup { setLoaded(true); 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) { return this;