If there is room for a player, don't tp to highest block

Author: eccentricdevotion

src/main/java/me/eccentric_nz/TARDIS/commands/utils/TARDISTeleportCommand.java

@@ -26,6 +26,7 @@
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
+import org.bukkit.block.BlockFace;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -90,12 +91,16 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
                 while (!world.getChunkAt(spawn).isLoaded()) {
                     world.getChunkAt(spawn).load();
                 }
-                int highest = (world.getEnvironment() == Environment.NETHER) ? spawn.getBlockY() - 1 : world.getHighestBlockYAt(spawn);
+                int highest = spawn.getBlockY();
+                // check if there is room for a player
+                if (!spawn.getBlock().getType().isAir() || !spawn.getBlock().getRelative(BlockFace.UP).getType().isAir()) {
+                    highest = (world.getEnvironment() == Environment.NETHER) ? spawn.getBlockY() : world.getHighestBlockYAt(spawn) + 1;
+                }
                 float yaw = player.getLocation().getYaw();
                 float pitch = player.getLocation().getPitch();
                 spawn.setYaw(yaw);
                 spawn.setPitch(pitch);
-                spawn.setY(highest + 1);
+                spawn.setY(highest);
                 player.teleport(spawn);
             } else {
                 plugin.getMessenger().sendColouredCommand(player, "WORLD_NOT_FOUND", "/tardisworld", plugin);

src/main/java/me/eccentric_nz/TARDIS/upgrades/SystemUpgradeChecker.java

@@ -33,7 +33,7 @@ public boolean has(String uuid, SystemTree upgrade) {
         if (!rs.fromUUID(uuid)) {
             return false;
         }
-        // get player's artron energy level
+        // does the player have the system upgrade for their TARDIS
         ResultSetSystemUpgrades rsp = new ResultSetSystemUpgrades(plugin, rs.getTardisId(), uuid);
         if (!rsp.resultset()) {
             return false;