Check y value on #isSafePosition; prevent IllegalArgumentException (

Close #202)
WiIIiam278 · Sep 6, 2022 · b63b085 · b63b085
1 parent 1641ad5
commit b63b085
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/bukkit/src/main/java/net/william278/huskhomes/util/BukkitSafetyUtil.java b/bukkit/src/main/java/net/william278/huskhomes/util/BukkitSafetyUtil.java
@@ -20,6 +20,13 @@ public class BukkitSafetyUtil {
      */
     public static Optional<Location> findSafeLocation(@NotNull World world, @NotNull org.bukkit.Location bukkitLocation,
                                                       @NotNull ChunkSnapshot chunkSnapshot) {
+        // Validate world
+        final org.bukkit.World bukkitWorld = bukkitLocation.getWorld();
+        if (bukkitWorld == null) {
+            return Optional.empty();
+        }
+
+        // Search nearby blocks for a safe, valid position
         for (int i = -1; i <= 1; i++) {
             for (int j = -1; j <= 1; j++) {
                 int chunkX = Math.abs(bukkitLocation.getBlockX() % 16) + i;
@@ -28,7 +35,7 @@ public static Optional<Location> findSafeLocation(@NotNull World world, @NotNull
                     continue;
                 }
                 int chunkY = chunkSnapshot.getHighestBlockYAt(chunkX, chunkZ);
-                if (isSafePosition(chunkSnapshot, chunkX, chunkY, chunkZ)) {
+                if (isSafePosition(chunkSnapshot, chunkX, chunkY, chunkZ, bukkitWorld)) {
                     return Optional.of(new Location(bukkitLocation.getBlockX() + i,
                             chunkY + 1.5d, bukkitLocation.getBlockZ() + j,
                             90, 0, world));
@@ -45,9 +52,18 @@ public static Optional<Location> findSafeLocation(@NotNull World world, @NotNull
      * @param chunkX        The chunk x coordinate to search at
      * @param chunkY        The chunk y coordinate to search at
      * @param chunkZ        The chunk z coordinate to search at
+     * @param world         The world to search in
      * @return True if the block is safe, false otherwise
      */
-    public static boolean isSafePosition(@NotNull ChunkSnapshot chunkSnapshot, final int chunkX, final int chunkY, final int chunkZ) {
+    public static boolean isSafePosition(@NotNull ChunkSnapshot chunkSnapshot,
+                                         final int chunkX, final int chunkY, final int chunkZ,
+                                         @NotNull org.bukkit.World world) {
+        // Check validity of the y-coordinate
+        if (chunkY < world.getMinHeight() || chunkY > world.getMaxHeight()) {
+            return false;
+        }
+
+        // Check block safety
         final Material blockType = chunkSnapshot.getBlockType(chunkX, chunkY, chunkZ);
         return switch (blockType) {
             // Special case handling for safe, un-solid blocks