From 1235f7012e7f0ff18da8d6cb1fab2c2a23781fc2 Mon Sep 17 00:00:00 2001 From: AlexProgrammerDE <40795980+AlexProgrammerDE@users.noreply.github.com> Date: Fri, 24 Jan 2025 14:12:33 +0100 Subject: [PATCH] Fixup data consistency check --- .../src/test/java/com/soulfiremc/test/DataTest.java | 12 ++++++------ .../test/utils/TestBlockAccessorBuilder.java | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/src/test/java/com/soulfiremc/test/DataTest.java b/server/src/test/java/com/soulfiremc/test/DataTest.java index 1b75313f7..550a56fc0 100644 --- a/server/src/test/java/com/soulfiremc/test/DataTest.java +++ b/server/src/test/java/com/soulfiremc/test/DataTest.java @@ -28,11 +28,11 @@ public class DataTest { public void checkBlockStateTypeCorrect() { var airBlockState = BlockState.forDefaultBlockType(BlockType.AIR); - assertEquals(airBlockState.blockType(), BlockType.AIR); - assertNotEquals(airBlockState.blockType(), BlockType.DIRT); + assertEquals(BlockType.AIR, airBlockState.blockType()); + assertNotEquals(BlockType.DIRT, airBlockState.blockType()); - assertSame(airBlockState.blockType(), BlockType.AIR); - assertNotSame(airBlockState.blockType(), BlockType.DIRT); + assertSame(BlockType.AIR, airBlockState.blockType()); + assertNotSame(BlockType.DIRT, airBlockState.blockType()); } @Test @@ -43,7 +43,7 @@ public void checkBlockShapesCorrect() { assertNotEquals(airBlockState.collisionShape(), dirtBlockState.collisionShape()); assertNotSame(airBlockState.collisionShape(), dirtBlockState.collisionShape()); - assertEquals(airBlockState.collisionShape().blockShapes().size(), 0); - assertEquals(dirtBlockState.collisionShape().blockShapes().size(), 1); + assertEquals(0, airBlockState.collisionShape().blockShapes().size()); + assertEquals(1, dirtBlockState.collisionShape().blockShapes().size()); } } diff --git a/server/src/test/java/com/soulfiremc/test/utils/TestBlockAccessorBuilder.java b/server/src/test/java/com/soulfiremc/test/utils/TestBlockAccessorBuilder.java index 7391ba928..a4db904ef 100644 --- a/server/src/test/java/com/soulfiremc/test/utils/TestBlockAccessorBuilder.java +++ b/server/src/test/java/com/soulfiremc/test/utils/TestBlockAccessorBuilder.java @@ -43,10 +43,10 @@ public void setBlockAt(int x, int y, int z, BlockType block) { var targetState = BlockState.forDefaultBlockType(block); if (targetState == defaultBlock) { blocks.remove(SFVec3i.from(x, y, z)); - return; + } else { + blocks.put(SFVec3i.from(x, y, z), targetState); } - blocks.put(SFVec3i.from(x, y, z), targetState); minX = Math.min(minX, x); minY = Math.min(minY, y); minZ = Math.min(minZ, z);