Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2019-11-22 00:24:08 -04:00
commit aa8f5c1921
8 files changed
+73 -30

No files matched your search

@@ -2354,7 +2354,7 @@ public class CarpetExpression
cz = (int)((NumericValue) lv.get(2).evalValue(c)).getLong();
if (lv.size()==3)
{
Value retval = new ListValue(Arrays.asList(
Value retval = ListValue.of(
BlockValue.fromCoords(cc, cx, cy-1, cz),
BlockValue.fromCoords(cc, cx, cy, cz),
BlockValue.fromCoords(cc, cx-1, cy, cz),
@@ -2362,7 +2362,7 @@ public class CarpetExpression
BlockValue.fromCoords(cc, cx+1, cy, cz),
BlockValue.fromCoords(cc, cx, cy, cz+1),
BlockValue.fromCoords(cc, cx, cy+1, cz)
));
);
return (_c, _t ) -> retval;
}
else if (lv.size()==4)