From f2989d51fda5206691343d33b45b901d52195335 Mon Sep 17 00:00:00 2001 From: altrisi Date: Sat, 8 Jan 2022 21:09:15 +0100 Subject: [PATCH] Improve CarpetExpressionException error messages (#1230) --- src/main/java/carpet/script/CarpetExpression.java | 2 +- src/main/java/carpet/script/CarpetScriptHost.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index d8b9c5f9..60da9003 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -91,7 +91,7 @@ public class CarpetExpression public Value scriptRunCommand(ScriptHost host, BlockPos pos) { if (CarpetServer.scriptServer.stopAll) - throw new CarpetExpressionException("SCRIPTING PAUSED", null); + throw new CarpetExpressionException("SCRIPTING PAUSED (unpause with /script resume)", null); try { Context context = new CarpetContext(host, source, origin). diff --git a/src/main/java/carpet/script/CarpetScriptHost.java b/src/main/java/carpet/script/CarpetScriptHost.java index ef67e102..67614b11 100644 --- a/src/main/java/carpet/script/CarpetScriptHost.java +++ b/src/main/java/carpet/script/CarpetScriptHost.java @@ -732,10 +732,10 @@ public class CarpetScriptHost extends ScriptHost public Value callLegacy(ServerCommandSource source, String call, List coords, String arg) { if (CarpetServer.scriptServer.stopAll) - throw new CarpetExpressionException("SCARPET PAUSED", null); + throw new CarpetExpressionException("SCARPET PAUSED (unpause with /script resume)", null); FunctionValue function = getFunction(call); if (function == null) - throw new CarpetExpressionException("UNDEFINED", null); + throw new CarpetExpressionException("Couldn't find function '" + call + "' in app '" + this.getName() + "'", null); List argv = new ArrayList<>(); if (coords != null) for (Integer i: coords) @@ -832,7 +832,7 @@ public class CarpetScriptHost extends ScriptHost public Value call(ServerCommandSource source, FunctionValue function, List argv) { if (CarpetServer.scriptServer.stopAll) - throw new CarpetExpressionException("SCARPET PAUSED", null); + throw new CarpetExpressionException("SCARPET PAUSED (unpause with /script resume)", null); List args = function.getArguments(); if (argv.size() != args.size())