Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-27 07:34:27 +00:00
Code Issues Projects Releases Wiki Activity

Catch LuaError when loading scene groups

Browse Source
This commit is contained in:
KingRainbow44 2023-04-24 03:11:47 -04:00
parent 9c77ddc42e
commit 3e6b38c407
No known key found for this signature in database
GPG Key ID: FC2CB64B00D257BE
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ import javax.script.ScriptException;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.ToString; import lombok.ToString;
import org.luaj.vm2.LuaError;
import org.luaj.vm2.LuaValue; import org.luaj.vm2.LuaValue;
@ToString @ToString
@ -165,11 +166,13 @@ public final class SceneGroup {
// Add monsters and gadgets to suite // Add monsters and gadgets to suite
this.suites.forEach(i -> i.init(this)); this.suites.forEach(i -> i.init(this));
} catch (ScriptException e) { } catch (ScriptException e) {
Grasscutter.getLogger() Grasscutter.getLogger()
.error( .error(
"An error occurred while loading group " + this.id + " in scene " + sceneId + ".", e); "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); Grasscutter.getLogger().debug("Successfully loaded group {} in scene {}.", this.id, sceneId);