Merge branch 'master' into 1.16

This commit is contained in:
gnembon committed 2020-05-02 20:19:34 -03:00
commit 1f65c1b55c
3 files changed
+6 -4

No files matched your search

@@ -1153,7 +1153,7 @@ public class CarpetExpression
if (!needSize) return LazyValue.TRUE;
Value ret = ListValue.of(
ListValue.of(new NumericValue(box.minX), new NumericValue(box.minY), new NumericValue(box.minZ)),
ListValue.of(new NumericValue(box.minX), new NumericValue(box.minY), new NumericValue(box.minZ))
ListValue.of(new NumericValue(box.maxX), new NumericValue(box.maxY), new NumericValue(box.maxZ))
);
return (_c, _t) -> ret;
}
@@ -1165,7 +1165,7 @@ public class CarpetExpression
Value key = new StringValue(FeatureGenerator.structureToFeature.get(str.getName()).get(0));
ret.put(key, (!needSize)?Value.NULL:ListValue.of(
ListValue.of(new NumericValue(box.minX), new NumericValue(box.minY), new NumericValue(box.minZ)),
ListValue.of(new NumericValue(box.minX), new NumericValue(box.minY), new NumericValue(box.minZ))
ListValue.of(new NumericValue(box.maxX), new NumericValue(box.maxY), new NumericValue(box.maxZ))
));
}
Value retMap = MapValue.wrap(ret);