Merge branch 'master' into 1.17

This commit is contained in:
gnembon committed 2021-05-25 17:25:55 -03:00
commit b96a1b1216
23 files changed
+111 -81

No files matched your search

@@ -689,19 +689,19 @@ public class WorldAccess {
// lazy cause its parked execution
expression.addLazyFunction("without_updates", 1, (c, t, lv) ->
{
boolean previous = CarpetSettings.impendingFillSkipUpdates;
boolean previous = CarpetSettings.impendingFillSkipUpdates.get();
if (previous) return lv.get(0);
Value [] result = new Value[]{Value.NULL};
((CarpetContext)c).s.getMinecraftServer().submitAndJoin( () ->
{
try
{
CarpetSettings.impendingFillSkipUpdates = true;
CarpetSettings.impendingFillSkipUpdates.set(true);
result[0] = lv.get(0).evalValue(c, t);
}
finally
{
CarpetSettings.impendingFillSkipUpdates = previous;
CarpetSettings.impendingFillSkipUpdates.set(previous);
}
});
return (cc, tt) -> result[0];