kaboomserver/extras
1
0
Fork 0
mirror of https://github.com/kaboomserver/extras.git synced 2024-05-17 18:31:17 +00:00
Code Issues Projects Releases Wiki Activity

Don't allow cross-dimensional /spawn on Folia servers

Browse source
This commit is contained in:
Allink 2023-03-30 19:34:06 +01:00
parent 21b579e37a
commit beb00d1494
No known key found for this signature in database
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/pw/kaboom/extras/commands/CommandSpawn.java
View file

@ -21,14 +21,6 @@ public final class CommandSpawn implements CommandExecutor {
final @Nonnull Command command,
final @Nonnull String label,
final String[] args) {
final Main plugin = JavaPlugin.getPlugin(Main.class);
if (plugin.isFolia()) {
sender.sendMessage(Component
.text("Command cannot be ran on Folia servers!"));
return true;
}
if (sender instanceof ConsoleCommandSender) {
sender.sendMessage(Component
.text("Command has to be run by a player"));
@ -36,8 +28,18 @@ public final class CommandSpawn implements CommandExecutor {
}
final Player player = (Player) sender;
final World playerWorld = player.getWorld();
final World defaultWorld = Bukkit.getWorld("world");
final World world = (defaultWorld == null) ? Bukkit.getWorlds().get(0) : defaultWorld;
final Main plugin = JavaPlugin.getPlugin(Main.class);
if (!world.equals(playerWorld) && plugin.isFolia()) {
sender.sendMessage(Component
.text("Cross-dimensional teleports are currently unsupported on Folia."));
return true;
}
final Location spawnLocation = world.getSpawnLocation();
final int maxWorldHeight = 256;