fix: allow spawning in places other than default world

Author: amyavi

src/main/java/pw/kaboom/extras/commands/CommandSpawn.java

@@ -1,15 +1,12 @@
 package pw.kaboom.extras.commands;
 
 import net.kyori.adventure.text.Component;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerTeleportEvent;
+import pw.kaboom.extras.util.Utility;
 
 import javax.annotation.Nonnull;
 
@@ -24,23 +21,7 @@ public boolean onCommand(final @Nonnull CommandSender sender,
             return true;
         }
 
-        final World defaultWorld = Bukkit.getWorld("world");
-        final World world = (defaultWorld == null) ? Bukkit.getWorlds().get(0) : defaultWorld;
-        final Location spawnLocation = world.getSpawnLocation();
-        final int maxWorldHeight = 256;
-
-        for (double y = spawnLocation.getY(); y <= maxWorldHeight; y++) {
-            final Location yLocation = new Location(world, spawnLocation.getX(), y,
-                    spawnLocation.getZ());
-            final Block coordBlock = world.getBlockAt(yLocation);
-
-            if (!coordBlock.getType().isSolid()
-                    && !coordBlock.getRelative(BlockFace.UP).getType().isSolid()) {
-                player.teleportAsync(yLocation);
-                break;
-            }
-        }
-
+        Utility.teleportToSpawn(player, PlayerTeleportEvent.TeleportCause.COMMAND);
         player.sendMessage(Component
                 .text("Successfully moved to spawn"));
         return true;

src/main/java/pw/kaboom/extras/modules/player/PlayerDamage.java

@@ -19,6 +19,7 @@
 import org.bukkit.event.entity.EntityRegainHealthEvent;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffect;
 import pw.kaboom.extras.util.Utility;
@@ -103,8 +104,7 @@ void onPlayerDeath(final PlayerDeathEvent event) {
             if (player.getRespawnLocation() != null) {
                 player.teleportAsync(player.getRespawnLocation());
             } else {
-                final World world = Bukkit.getWorld("world");
-                player.teleportAsync(world.getSpawnLocation());
+                Utility.teleportToSpawn(player, PlayerTeleportEvent.TeleportCause.UNKNOWN);
             }
         } catch (Exception exception) {
             Utility.resetAttribute(player, Attribute.MAX_HEALTH);

src/main/java/pw/kaboom/extras/util/Utility.java

@@ -1,19 +1,34 @@
 package pw.kaboom.extras.util;
 
 import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.World;
 import org.bukkit.attribute.Attributable;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeInstance;
 import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerTeleportEvent;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.concurrent.Callable;
 import java.util.function.Function;
 
 public final class Utility {
+    public static void teleportToSpawn(final Player player,
+                                       final PlayerTeleportEvent.TeleportCause cause) {
+        final World world = player.getServer().getRespawnWorld();
+        final Location spawnLocation = world.getSpawnLocation();
+
+        final int y = world.getHighestBlockYAt(spawnLocation);
+        final Location location = new Location(world,
+            spawnLocation.x(), y + 1, spawnLocation.z(),
+            spawnLocation.getYaw(), spawnLocation.getPitch());
+        player.teleportAsync(location, cause);
+    }
+
     public static @Nullable Player getPlayerExactIgnoreCase(final String username) {
         return Bukkit.getOnlinePlayers()
                 .stream()