Merge branch 'master' into 1.17

This commit is contained in:
gnembon committed 2021-05-05 01:31:00 -03:00
commit 820c9b6489
31 files changed
+1188 -211

No files matched your search

@@ -819,7 +819,7 @@ public class Auxiliary {
return Value.TRUE;
});
expression.addFunction("logger", lv ->
expression.addImpureFunction("logger", lv ->
{
Value res;
@@ -25,7 +25,7 @@ public class Threading
});
// has to be lazy due to deferred execution of the expression
expression.addLazyFunctionWithDelegation("task_dock", 1, (c, t, expr, tok, lv) -> {
expression.addLazyFunctionWithDelegation("task_dock", 1, false,true, (c, t, expr, tok, lv) -> {
CarpetContext cc = (CarpetContext)c;
MinecraftServer server = cc.s.getMinecraftServer();
if (server.isOnThread()) return lv.get(0); // pass through for on thread tasks