-
Notifications
You must be signed in to change notification settings - Fork 10
Feature/player selectors #19
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
e42989f
Added @a, @r and @p selector for /pr startother
svenar-nl f1b8406
Removed patreon link
svenar-nl 7ee2139
Added svenar repo & upgraded paper to 1.21.5
svenar-nl 8a05baa
Removed some parts from the PR template that are not relevant
svenar-nl 993de0b
Updated build to run using ubuntu-latest and JDK 21
svenar-nl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -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(players.get(new Random().nextInt(players.size()))); | |
| return List.of(players.get(RANDOM.nextInt(players.size()))); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The use of 'break' in the loop when a camera is not found might prematurely end processing of other valid target players. Consider using 'continue' to ensure all players are evaluated.