Added @A, @r and @p selector for /pr startother

Author: svenar-nl

src/main/java/nl/svenar/powercamera/commands/subcommand/SubcommandStartOther.java

@@ -1,18 +1,26 @@
 package nl.svenar.powercamera.commands.subcommand;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.command.BlockCommandSender;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import nl.svenar.powercamera.CameraHandler;
 import nl.svenar.powercamera.PowerCamera;
 import nl.svenar.powercamera.commands.PowerCameraCommand;
 import nl.svenar.powercamera.commands.structure.CommandExecutionContext;
 import nl.svenar.powercamera.data.CameraMode;
 import nl.svenar.powercamera.data.PlayerCameraData;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
-@SuppressWarnings({"PMD.AvoidLiteralsInIfCondition", "PMD.CommentRequired", "PMD.LocalVariableCouldBeFinal", "PMD.MethodArgumentCouldBeFinal"})
+@SuppressWarnings({ "PMD.AvoidLiteralsInIfCondition", "PMD.CommentRequired", "PMD.LocalVariableCouldBeFinal",
+        "PMD.MethodArgumentCouldBeFinal" })
 public class SubcommandStartOther extends PowerCameraCommand {
 
     public SubcommandStartOther(PowerCamera plugin, String commandName) {
@@ -22,7 +30,8 @@ public SubcommandStartOther(PowerCamera plugin, String commandName) {
     @Override
     public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
         if (args.length != 2) {
-            sendMessage(sender, ChatColor.DARK_RED + "Usage: /" + commandLabel + " startother <playername> <cameraname>");
+            sendMessage(sender,
+                    ChatColor.DARK_RED + "Usage: /" + commandLabel + " startother <playername> <cameraname>");
             return false;
         }
 
@@ -34,27 +43,77 @@ public boolean onCommand(CommandSender sender, Command cmd, String commandLabel,
             return false;
         }
 
-        Player targetPlayer = Bukkit.getPlayer(targetName);
+        List<Player> targetPlayers = getPlayersFromSelector(sender, targetName);
 
-        if (targetPlayer == null) {
-            sendMessage(sender, ChatColor.DARK_RED + "Player '" + targetName + "' not found or is offline!");
+        if (targetPlayers.isEmpty()) {
+            sendMessage(sender, ChatColor.DARK_RED + "No matching players found for selector '" + targetName + "'");
             return false;
         }
 
-        PlayerCameraData cameraData = plugin.getPlayerData().get(targetPlayer);
+        for (Player targetPlayer : targetPlayers) {
+            PlayerCameraData cameraData = plugin.getPlayerData().get(targetPlayer);
 
-        if (cameraData.getCameraMode() != CameraMode.NONE) {
-            sendMessage(sender, ChatColor.DARK_RED + "Player '" + targetPlayer.getName() + "' already has a camera active!");
-            return false;
-        }
+            if (cameraData.getCameraMode() != CameraMode.NONE) {
+                sendMessage(sender,
+                        ChatColor.DARK_RED + "Player '" + targetPlayer.getName() + "' already has a camera active!");
+                continue;
+            }
 
-        if (this.plugin.getConfigCameras().cameraExists(cameraName)) {
-            cameraData.setCameraHandler(new CameraHandler(plugin, targetPlayer, cameraName).generatePath().start());
-            sender.sendMessage(plugin.getPluginChatPrefix() + ChatColor.GREEN + "Playing '" + cameraName + "' on player: " + targetPlayer.getName());
-        } else {
-            sendMessage(sender, ChatColor.RED + "Camera '" + cameraName + "' not found!");
+            if (this.plugin.getConfigCameras().cameraExists(cameraName)) {
+                cameraData.setCameraHandler(new CameraHandler(plugin, targetPlayer, cameraName).generatePath().start());
+                sender.sendMessage(plugin.getPluginChatPrefix() + ChatColor.GREEN + "Playing '" + cameraName
+                        + "' on player: " + targetPlayer.getName());
+            } else {
+                sendMessage(sender, ChatColor.RED + "Camera '" + cameraName + "' not found!");
+                break;
+            }
         }
 
         return false;
     }
+
+    private List<Player> getPlayersFromSelector(CommandSender sender, String selector) {
+        selector = selector.replace("@", "").toLowerCase();
+
+        if (selector.equals("a")) {
+            // All online players
+            return new ArrayList<>(Bukkit.getOnlinePlayers());
+        }
+
+        if (selector.equals("r")) {
+            // Random online player
+            List<Player> players = new ArrayList<>(Bukkit.getOnlinePlayers());
+            if (!players.isEmpty()) {
+                return List.of(players.get(new Random().nextInt(players.size())));
+            }
+            return List.of();
+        }
+
+        if (selector.equals("p")) {
+            // Nearest player to the command block or sender
+            if (sender instanceof BlockCommandSender blockSender) {
+                Location blockLocation = blockSender.getBlock().getLocation();
+                double closestDistance = Double.MAX_VALUE;
+                Player closestPlayer = null;
+
+                for (Player player : Bukkit.getOnlinePlayers()) {
+                    double distance = player.getLocation().distanceSquared(blockLocation);
+                    if (distance < closestDistance) {
+                        closestDistance = distance;
+                        closestPlayer = player;
+                    }
+                }
+
+                return closestPlayer != null ? List.of(closestPlayer) : List.of();
+            }
+
+            if (sender instanceof Player player) {
+                return List.of(player);
+            }
+        }
+
+        Player namedPlayer = Bukkit.getPlayer(selector);
+        return namedPlayer != null ? List.of(namedPlayer) : List.of();
+    }
+
 }