mirror of
https://github.com/kaboomserver/extras.git
synced 2024-06-19 18:37:44 +00:00
Don't allow cross-dimensional /spawn on Folia servers
This commit is contained in:
parent
21b579e37a
commit
beb00d1494
|
@ -21,14 +21,6 @@ public final class CommandSpawn implements CommandExecutor {
|
||||||
final @Nonnull Command command,
|
final @Nonnull Command command,
|
||||||
final @Nonnull String label,
|
final @Nonnull String label,
|
||||||
final String[] args) {
|
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) {
|
if (sender instanceof ConsoleCommandSender) {
|
||||||
sender.sendMessage(Component
|
sender.sendMessage(Component
|
||||||
.text("Command has to be run by a player"));
|
.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 Player player = (Player) sender;
|
||||||
|
final World playerWorld = player.getWorld();
|
||||||
final World defaultWorld = Bukkit.getWorld("world");
|
final World defaultWorld = Bukkit.getWorld("world");
|
||||||
final World world = (defaultWorld == null) ? Bukkit.getWorlds().get(0) : defaultWorld;
|
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 Location spawnLocation = world.getSpawnLocation();
|
||||||
final int maxWorldHeight = 256;
|
final int maxWorldHeight = 256;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue