Merge branch 'master' into 1.17

src/main/java/carpet/script/value/FunctionValue.java

@@ -150,11 +150,11 @@ public class FunctionValue extends Value implements Fluff.ILazyFunction
         return varArgs != null;
     }
 
-    public LazyValue callInContext(Expression callingExpression, Context c, Integer type, Expression e, Tokenizer.Token t, List<LazyValue> lazyParams)
+    public LazyValue callInContext(Context c, Integer type, List<LazyValue> lazyParams)
     {
         try
         {
-            return lazyEval(c, type, e, t, lazyParams);
+            return lazyEval(c, type, expression, token, lazyParams);
         }
         catch (ExpressionException exc)
         {
@@ -164,12 +164,12 @@ public class FunctionValue extends Value implements Fluff.ILazyFunction
         catch (InternalExpressionException exc)
         {
             exc.stack.add(this);
-            throw new ExpressionException(c, e, t, exc.getMessage(), exc.stack);
+            throw new ExpressionException(c, expression, token, exc.getMessage(), exc.stack);
         }
 
         catch (ArithmeticException exc)
         {
-            throw new ExpressionException(c, e, t, "Your math is wrong, "+exc.getMessage(), Collections.singletonList(this));
+            throw new ExpressionException(c, expression, token, "Your math is wrong, "+exc.getMessage(), Collections.singletonList(this));
         }
     }
 

src/main/java/carpet/script/value/NumericValue.java

@@ -41,6 +41,7 @@ public class NumericValue extends Value
     {
         if (value == null) return Value.NULL;
         if (value.doubleValue() == value.longValue()) return new NumericValue(value.longValue());
+        if (value instanceof Float) return new NumericValue(0.000_001D * Math.round(1_000_000.0D*value.doubleValue()));
         return new NumericValue(value.doubleValue());
     }
 

src/main/java/carpet/script/value/ValueConversions.java

@@ -299,23 +299,27 @@ public class ValueConversions
     public static Value of(StructureStart<?> structure)
     {
         if (structure == null || structure == StructureStart.DEFAULT) return Value.NULL;
-        List<Value> pieces = new ArrayList<>();
-        for (StructurePiece piece : structure.getChildren())
-        {
-            BlockBox box = piece.getBoundingBox();
-            pieces.add(ListValue.of(
-                    new StringValue( NBTSerializableValue.nameFromRegistryId(Registry.STRUCTURE_PIECE.getId(piece.getType()))),
-                    (piece.getFacing()== null)?Value.NULL: new StringValue(piece.getFacing().getName()),
-                    ListValue.fromTriple(box.minX, box.minY, box.minZ),
-                    ListValue.fromTriple(box.maxX, box.maxY, box.maxZ)
-            ));
-        }
         BlockBox boundingBox = structure.getBoundingBox();
+        if (boundingBox.maxX < boundingBox.minX || boundingBox.maxY < boundingBox.minY || boundingBox.maxZ < boundingBox.minZ) return Value.NULL;
         Map<Value, Value> ret = new HashMap<>();
         ret.put(new StringValue("box"), ListValue.of(
                 ListValue.fromTriple(boundingBox.minX, boundingBox.minY, boundingBox.minZ),
                 ListValue.fromTriple(boundingBox.maxX, boundingBox.maxY, boundingBox.maxZ)
         ));
+        List<Value> pieces = new ArrayList<>();
+        for (StructurePiece piece : structure.getChildren())
+        {
+            BlockBox box = piece.getBoundingBox();
+            if (box.maxX >= box.minX && box.maxY >= box.minY && box.maxZ >= box.minZ)
+            {
+                pieces.add(ListValue.of(
+                        new StringValue(NBTSerializableValue.nameFromRegistryId(Registry.STRUCTURE_PIECE.getId(piece.getType()))),
+                        (piece.getFacing() == null) ? Value.NULL : new StringValue(piece.getFacing().getName()),
+                        ListValue.fromTriple(box.minX, box.minY, box.minZ),
+                        ListValue.fromTriple(box.maxX, box.maxY, box.maxZ)
+                ));
+            }
+        }
         ret.put(new StringValue("pieces"), ListValue.wrap(pieces));
         return MapValue.wrap(ret);
     }