From 3cff9b51677c50596c9c7f305d51601a44fd479f Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Thu, 25 Jul 2019 05:49:58 -0700 Subject: [PATCH] fix braced command parsing --- .../denizencore/scripts/commands/BracedCommand.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/BracedCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/BracedCommand.java index b228ac14..396dc7d5 100644 --- a/src/main/java/com/denizenscript/denizencore/scripts/commands/BracedCommand.java +++ b/src/main/java/com/denizenscript/denizencore/scripts/commands/BracedCommand.java @@ -206,9 +206,16 @@ else if (arg.equals("}")) { Debug.echoDebug(scriptEntry, "Calculating " + cmd); } command.remove(0); + int lineNum = 1; + if (cmd.length() > 2 && cmd.charAt(0) == ScriptBuilder.LINE_PREFIX_CHAR && cmd.charAt(cmd.length() - 1) == ScriptBuilder.LINE_PREFIX_CHAR) { + lineNum = Integer.valueOf(cmd.substring(1, cmd.length() - 1)); + cmd = command.get(0); + command.remove(0); + } String[] args = new String[command.size()]; args = command.toArray(args); ScriptEntry newEntry = new ScriptEntry(cmd, args, scriptEntry.getScript() != null ? scriptEntry.getScript().getContainer() : null); + newEntry.internal.lineNumber = lineNum; newEntry.internal.originalLine = newEntry.toString(); bracesSection.add(newEntry); bracesSection.get(bracesSection.size() - 1).entryData.transferDataFrom(scriptEntry.entryData);