From c95c4b5f7d6ad3ea60ce88d68682dfb26435bd3b Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Mon, 11 Jan 2021 17:04:40 -0500 Subject: [PATCH] Fix jigsaw counting --- src/main/java/com/volmit/iris/object/IrisJigsawPiece.java | 4 ++-- src/main/java/com/volmit/iris/object/IrisJigsawStructure.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/volmit/iris/object/IrisJigsawPiece.java b/src/main/java/com/volmit/iris/object/IrisJigsawPiece.java index 09a30f44f..93492f0b8 100644 --- a/src/main/java/com/volmit/iris/object/IrisJigsawPiece.java +++ b/src/main/java/com/volmit/iris/object/IrisJigsawPiece.java @@ -53,7 +53,7 @@ public class IrisJigsawPiece extends IrisRegistrant } public int getMax3dDimension() { - return max2dDim.aquire(() -> { + return max3dDim.aquire(() -> { try { BlockVector v = IrisObject.sampleSize(getLoader().getObjectLoader().findFile(getObject())); return Math.max(Math.max(v.getBlockX(), v.getBlockZ()), v.getBlockY()); @@ -61,7 +61,7 @@ public class IrisJigsawPiece extends IrisRegistrant e.printStackTrace(); } - return 0; + return -1; }); } diff --git a/src/main/java/com/volmit/iris/object/IrisJigsawStructure.java b/src/main/java/com/volmit/iris/object/IrisJigsawStructure.java index 6138804a6..ddfb82323 100644 --- a/src/main/java/com/volmit/iris/object/IrisJigsawStructure.java +++ b/src/main/java/com/volmit/iris/object/IrisJigsawStructure.java @@ -95,7 +95,7 @@ public class IrisJigsawStructure extends IrisRegistrant max = Math.max(max, getLoader().getJigsawPieceLoader().load(i).getMax3dDimension()); } - return max; + return max * (((getMaxDepth() + 1) * 2) + 1); }); } }