From 3e6b38c407198e55363c81823329efd72e67e242 Mon Sep 17 00:00:00 2001 From: KingRainbow44 Date: Mon, 24 Apr 2023 03:11:47 -0400 Subject: [PATCH] Catch `LuaError` when loading scene groups --- src/main/java/emu/grasscutter/scripts/data/SceneGroup.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/emu/grasscutter/scripts/data/SceneGroup.java b/src/main/java/emu/grasscutter/scripts/data/SceneGroup.java index 27815433f..efb7b23e7 100644 --- a/src/main/java/emu/grasscutter/scripts/data/SceneGroup.java +++ b/src/main/java/emu/grasscutter/scripts/data/SceneGroup.java @@ -15,6 +15,7 @@ import javax.script.ScriptException; import lombok.Getter; import lombok.Setter; import lombok.ToString; +import org.luaj.vm2.LuaError; import org.luaj.vm2.LuaValue; @ToString @@ -165,11 +166,13 @@ public final class SceneGroup { // Add monsters and gadgets to suite this.suites.forEach(i -> i.init(this)); - } catch (ScriptException e) { Grasscutter.getLogger() .error( "An error occurred while loading group " + this.id + " in scene " + sceneId + ".", e); + } catch (LuaError luaError) { + Grasscutter.getLogger().error("An error occurred while loading group %s in scene %s." + .formatted(this.id, sceneId), luaError); } Grasscutter.getLogger().debug("Successfully loaded group {} in scene {}.", this.id, sceneId);