add bounds checks to x coordinate

Author: tildejustin

1.13.x/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java

@@ -45,10 +45,14 @@ private int setSpawn(Random random, int bounds, Operation<Integer> original, @Lo
             return originalResult;
         }
 
-        // Transform x and z coordinates into correct Random#nextInt result.
-        int result = ((MathHelper.floor(seedObject.getX()) - worldSpawn.getX()) + spawnRadius) + ((MathHelper.floor(seedObject.getZ()) - worldSpawn.getZ()) + spawnRadius) * (spawnRadius * 2 + 1);
+        // Transform x and z coordinates into corresponding Random#nextInt result.
+        int spawnDiameter = spawnRadius * 2 + 1;
+        int x = MathHelper.floor(seedObject.getX());
+        int z = MathHelper.floor(seedObject.getZ());
+        int xLocal = x - worldSpawn.getX() + spawnRadius;
+        int result = xLocal + (z - worldSpawn.getZ() + spawnRadius) * spawnDiameter;
 
-        if (result >= 0 && result < bounds) {
+        if (xLocal >=0 && xLocal < spawnDiameter && result >= 0 && result < bounds) {
             // we save the original result in case the set spawn is invalid, see fallbackOnInvalidSpawn
             System.out.println("Setting spawn");
             originalRandomResult.set(originalResult);

1.14-1.18.2/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java

@@ -47,9 +47,10 @@ private int setSpawn(Random random, int bounds, Operation<Integer> original, @Lo
         int spawnDiameter = spawnRadius * 2 + 1;
         int x = MathHelper.floor(seedObject.getX());
         int z = MathHelper.floor(seedObject.getZ());
-        int result = (x - worldSpawn.getX() + spawnRadius) + (z - worldSpawn.getZ() + spawnRadius) * spawnDiameter;
+        int xLocal = x - worldSpawn.getX() + spawnRadius;
+        int result = xLocal + (z - worldSpawn.getZ() + spawnRadius) * spawnDiameter;
 
-        if (result >= 0 && result < bounds) {
+        if (xLocal >=0 && xLocal < spawnDiameter && result >= 0 && result < bounds) {
             // we save the original result in case the set spawn is invalid, see fallbackOnInvalidSpawn
             System.out.println("Setting spawn");
             originalRandomResult.set(originalResult);

1.19-1.21.4/src/main/java/net/set/spawn/mod/mixin/ServerPlayerEntityMixin.java

@@ -50,9 +50,10 @@ private int setSpawn(Random random, int bounds, Operation<Integer> original, @Lo
         int spawnDiameter = spawnRadius * 2 + 1;
         int x = MathHelper.floor(seedObject.getX());
         int z = MathHelper.floor(seedObject.getZ());
-        int result = (x - worldSpawn.getX() + spawnRadius) + (z - worldSpawn.getZ() + spawnRadius) * spawnDiameter;
+        int xLocal = x - worldSpawn.getX() + spawnRadius;
+        int result = xLocal + (z - worldSpawn.getZ() + spawnRadius) * spawnDiameter;
 
-        if (result >= 0 && result < bounds) {
+        if (xLocal >=0 && xLocal < spawnDiameter && result >= 0 && result < bounds) {
             // we save the original result in case the set spawn is invalid, see fallbackOnInvalidSpawn
             originalRandomResult.set(originalResult);
             System.out.println("Setting spawn");