Fix structure locating (integer overflow)

xpple · Nov 5, 2024 · 799f10e · 799f10e
1 parent 8f2a4f1
commit 799f10e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/main/java/dev/xpple/seedmapper/command/commands/LocateCommand.java b/src/main/java/dev/xpple/seedmapper/command/commands/LocateCommand.java
@@ -99,8 +99,7 @@ private static int locateStructure(CustomClientCommandSource source, int structu
             int regionSize = StructureConfig.regionSize(structureConfig) << 4;
             SpiralLoop.spiral(center.getX() / regionSize, center.getZ() / regionSize, Level.MAX_LEVEL_SIZE / regionSize, (x, z) -> {
                 MemorySegment structurePos = Pos.allocate(arena);
-                int valid = Cubiomes.getStructurePos(structure, version, seed, x, z, structurePos);
-                if (valid == 0) {
+                if (Cubiomes.getStructurePos(structure, version, seed, x, z, structurePos) == 0) {
                     return false;
                 }
                 if (Cubiomes.isViableStructurePos(structure, generator, Pos.x(structurePos), Pos.z(structurePos), 0) == 0) {

diff --git a/src/main/java/dev/xpple/seedmapper/util/SpiralLoop.java b/src/main/java/dev/xpple/seedmapper/util/SpiralLoop.java
@@ -17,7 +17,7 @@ public static void spiral(final int centerX, final int centerZ, final int radius
         int x = centerX, dx = 0, z = centerZ, dz = -step;
         final int leftBoundX = centerX - radius, rightBoundX = centerX + radius;
         final int bottomBoundZ = centerZ - radius, topBoundZ = centerZ + radius;
-        final int max = (2 * radius + 1) * (2 * radius + 1);
+        final long max = (2L * radius + 1) * (2L * radius + 1);
         for (int i = 0; i < max ; i++) {
             if (leftBoundX <= x && x <= rightBoundX && bottomBoundZ <= z && z <= topBoundZ) {
                 if (callback.consume(x, z)) {