From b631f7b62e68fa9f5eb998dcb41b292b82eecec6 Mon Sep 17 00:00:00 2001 From: gnembon Date: Sun, 10 May 2020 18:44:49 -0300 Subject: [PATCH 1/2] fixed notation of ranges --- src/main/java/carpet/script/value/LazyListValue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/carpet/script/value/LazyListValue.java b/src/main/java/carpet/script/value/LazyListValue.java index 55df4ae5..e57d7110 100644 --- a/src/main/java/carpet/script/value/LazyListValue.java +++ b/src/main/java/carpet/script/value/LazyListValue.java @@ -48,7 +48,7 @@ public abstract class LazyListValue extends AbstractListValue implements Iterato @Override public String getString() { - return String.format(Locale.ROOT, "[%d, %d, ..., %d]",start, start+stepp, limit); + return String.format(Locale.ROOT, "[%d, %d, ..., %d)",start, start+stepp, limit); } }; } From f7cfcb41580e73fc4ad826f40b091802f4479666 Mon Sep 17 00:00:00 2001 From: gnembon Date: Mon, 11 May 2020 01:01:36 -0300 Subject: [PATCH 2/2] oupsie --- src/main/java/carpet/script/CarpetExpression.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index 06bded9a..65e1dba5 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -2794,7 +2794,7 @@ public class CarpetExpression this.expr.addLazyFunction("task_dock", 1, (c, t, lv) -> { CarpetContext cc = (CarpetContext)c; MinecraftServer server = cc.s.getMinecraftServer(); - if (server.isOnThread()) return lv.get(1); // pass through for on thread tasks + if (server.isOnThread()) return lv.get(0); // pass through for on thread tasks Value[] result = new Value[]{Value.NULL}; ((CarpetContext) c).s.getMinecraftServer().submitAndJoin(() -> result[0] = lv.get(0).evalValue(c, t)); Value ret = result[0]; // preventing from lazy evaluating of the result in case a future completes later