Better support for at and as executions

Author: Pascalpex

deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/BuildworldCommand.java

@@ -27,15 +27,11 @@ public static LiteralCommandNode<CommandSourceStack> create() {
     public int run(CommandContext<CommandSourceStack> commandContext) throws CommandSyntaxException {
         Component prefix = MessagesFile.getMessage(MessagesEntry.PREFIX).appendSpace();
         CommandSender sender = commandContext.getSource().getSender();
-        if (sender instanceof Player player) {
-            try {
-                player.teleport(Bukkit.getWorld(Config.getBuildworld()).getSpawnLocation());
-                player.sendMessage(prefix.append(MessagesFile.getMessage(MessagesEntry.BUILDWORLD_WELCOME)));
-            } catch (IllegalArgumentException e) {
-                player.sendMessage(prefix.append(MessagesFile.getMessage(MessagesEntry.BUILDWORLD_NOT_SET)));
-            }
-        } else {
-            sender.sendMessage(prefix.append(MessagesFile.getMessage(MessagesEntry.ONLY_FOR_PLAYERS)));
+        try {
+            commandContext.getSource().getExecutor().teleport(Bukkit.getWorld(Config.getBuildworld()).getSpawnLocation());
+            sender.sendMessage(prefix.append(MessagesFile.getMessage(MessagesEntry.BUILDWORLD_WELCOME)));
+        } catch (IllegalArgumentException e) {
+            sender.sendMessage(prefix.append(MessagesFile.getMessage(MessagesEntry.BUILDWORLD_NOT_SET)));
         }
         return SINGLE_SUCCESS;
     }

deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/SetbuildworldCommand.java

@@ -27,13 +27,8 @@ public static LiteralCommandNode<CommandSourceStack> create() {
     public int run(CommandContext<CommandSourceStack> commandContext) throws CommandSyntaxException {
         Component prefix = MessagesFile.getMessage(MessagesEntry.PREFIX).appendSpace();
         CommandSender sender = commandContext.getSource().getSender();
-        if (sender instanceof Player player) {
-            World world = player.getLocation().getWorld();
-            Config.setBuildworld(world.getName());
-            player.sendMessage(prefix.append(MessagesFile.getMessage(MessagesEntry.BUILDWORLD_SET)));
-        } else {
-            sender.sendMessage(prefix.append(MessagesFile.getMessage(MessagesEntry.ONLY_FOR_PLAYERS)));
-        }
+        Config.setBuildworld(commandContext.getSource().getLocation().getWorld().getName());
+        sender.sendMessage(prefix.append(MessagesFile.getMessage(MessagesEntry.BUILDWORLD_SET)));
         return SINGLE_SUCCESS;
     }
 }

deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/SetspawnCommand.java

@@ -26,12 +26,8 @@ public static LiteralCommandNode<CommandSourceStack> create() {
     public int run(CommandContext<CommandSourceStack> commandContext) throws CommandSyntaxException {
         Component prefix = MessagesFile.getMessage(MessagesEntry.PREFIX).appendSpace();
         CommandSender sender = commandContext.getSource().getSender();
-        if (sender instanceof Player player) {
-            Config.setSpawn(player.getLocation());
-            player.sendMessage(prefix.append(MessagesFile.getMessage(MessagesEntry.SPAWN_SET)));
-        } else {
-            sender.sendMessage(prefix.append(MessagesFile.getMessage(MessagesEntry.ONLY_FOR_PLAYERS)));
-        }
+        Config.setSpawn(commandContext.getSource().getLocation());
+        sender.sendMessage(prefix.append(MessagesFile.getMessage(MessagesEntry.SPAWN_SET)));
         return SINGLE_SUCCESS;
     }
 }

deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/commands/SpawnCommand.java

@@ -37,15 +37,11 @@ public static void playerJoin(Player player) {
     public int run(CommandContext<CommandSourceStack> commandContext) throws CommandSyntaxException {
         Component prefix = MessagesFile.getMessage(MessagesEntry.PREFIX).appendSpace();
         CommandSender sender = commandContext.getSource().getSender();
-        if (sender instanceof Player player) {
-            try {
-                player.teleport(Config.getSpawn());
-                player.sendMessage(prefix.append(MessagesFile.getMessage(MessagesEntry.SPAWN_TELEPORTED)));
-            } catch (IllegalArgumentException e) {
-                player.sendMessage(prefix.append(MessagesFile.getMessage(MessagesEntry.SPAWN_NOT_SET)));
-            }
-        } else {
-            sender.sendMessage(prefix.append(MessagesFile.getMessage(MessagesEntry.ONLY_FOR_PLAYERS)));
+        try {
+            commandContext.getSource().getExecutor().teleport(Config.getSpawn());
+            sender.sendMessage(prefix.append(MessagesFile.getMessage(MessagesEntry.SPAWN_TELEPORTED)));
+        } catch (IllegalArgumentException e) {
+            sender.sendMessage(prefix.append(MessagesFile.getMessage(MessagesEntry.SPAWN_NOT_SET)));
         }
         return SINGLE_SUCCESS;
     }

deepslateMC-server/src/main/java/de/pascalpex/deepslatemc/files/MessagesEntry.java

@@ -8,7 +8,6 @@ public enum MessagesEntry {
     CONFIG_RELOADED("configReloaded", "<green>Config got reloaded successfully"),
     ONLY_FOR_PLAYERS("onlyForPlayers", "<red>This command can only be used by players"),
     DISCORD_MESSAGE("discordMessage", "<gold>The link to our Discord server: <aqua>%link%"),
-    NO_PERMISSIONS("noPermissions", "<red>You have no permission to do this"),
     CLEARED_CHAT("clearedChat", "<gold>The chat got cleared by <aqua>%clearer%"),
     BUILDWORLD_SET("buildworldSet", "<green>The buildworld got set successfully"),
     BUILDWORLD_WELCOME("buildworldWelcome", "<green>Welcome to the buildworld"),