summaryrefslogtreewikicommitdiff
path: root/src/main/java/net/tylermurphy/hideAndSeek/command
diff options
context:
space:
mode:
authorTyler Murphy <tylerm@tylerm.dev>2023-07-28 18:21:37 -0400
committerTyler Murphy <tylerm@tylerm.dev>2023-07-28 18:21:37 -0400
commitdd9a6dfd888954a174fd95432c72d585fac74ca5 (patch)
tree07411203c469e5d9adefe50583b0ce3f688fd8a4 /src/main/java/net/tylermurphy/hideAndSeek/command
parentMerge pull request 'update deps to 1.20' (#9) from dev into main (diff)
downloadkenshinshideandseek-dd9a6dfd888954a174fd95432c72d585fac74ca5.tar.gz
kenshinshideandseek-dd9a6dfd888954a174fd95432c72d585fac74ca5.tar.bz2
kenshinshideandseek-dd9a6dfd888954a174fd95432c72d585fac74ca5.zip
1.7.5 rc1
Diffstat (limited to 'src/main/java/net/tylermurphy/hideAndSeek/command')
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/command/Start.java32
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java2
2 files changed, 17 insertions, 17 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Start.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Start.java
index 5184933..83665a0 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/Start.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Start.java
@@ -7,6 +7,7 @@ import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -33,19 +34,21 @@ public class Start implements ICommand {
sender.sendMessage(errorPrefix + message("START_MIN_PLAYERS").addAmount(minPlayers));
return;
}
- String seekerName;
+
if (args.length < 1) {
Main.getInstance().getGame().start();
return;
- } else {
- seekerName = args[0];
- }
- Player seeker = Bukkit.getPlayer(seekerName);
- if (seeker == null || !Main.getInstance().getBoard().contains(seeker)) {
- sender.sendMessage(errorPrefix + message("START_INVALID_NAME").addPlayer(seekerName));
- return;
- }
- Main.getInstance().getGame().start(seeker);
+ };
+
+ List<Player> initialSeekers = new ArrayList<>(args.length);
+ for (int i = 0; i < args.length; i++) {
+ Player seeker = Bukkit.getPlayer(args[i]);
+ if (seeker == null || !Main.getInstance().getBoard().contains(seeker) || initialSeekers.contains(seeker)) {
+ sender.sendMessage(errorPrefix + message("START_INVALID_NAME").addPlayer(args[i]));
+ return;
+ }
+ }
+ Main.getInstance().getGame().start(initialSeekers);
}
public String getLabel() {
@@ -53,18 +56,15 @@ public class Start implements ICommand {
}
public String getUsage() {
- return "<*player>";
+ return "<*seekers...>";
}
public String getDescription() {
- return "Starts the game either with a random seeker or chosen one";
+ return "Starts the game either with a random set of seekers or a chosen list";
}
public List<String> autoComplete(@NotNull String parameter, @NotNull String typed) {
- if(parameter.equals("player")) {
- return Main.getInstance().getBoard().getPlayers().stream().map(Player::getName).collect(Collectors.toList());
- }
- return null;
+ return Main.getInstance().getBoard().getPlayers().stream().map(Player::getName).collect(Collectors.toList());
}
}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java b/src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java
index 9bfdd0e..907f031 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java
@@ -51,7 +51,7 @@ public class CommandGroup {
if (data == null) {
player.sendMessage(
- String.format("%s%sKenshin's Hide and Seek %s(%s1.7.4%s)\n", ChatColor.AQUA, ChatColor.BOLD, ChatColor.GRAY, ChatColor.WHITE, ChatColor.GRAY) +
+ String.format("%s%sKenshin's Hide and Seek %s(%s1.7.5%s)\n", ChatColor.AQUA, ChatColor.BOLD, ChatColor.GRAY, ChatColor.WHITE, ChatColor.GRAY) +
String.format("%sAuthor: %s[KenshinEto]\n", ChatColor.GRAY, ChatColor.WHITE) +
String.format("%sHelp Command: %s/hs %shelp", ChatColor.GRAY, ChatColor.AQUA, ChatColor.WHITE)
);