2 files changed, 25 insertions, 18 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..455e777 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/Start.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Start.java
@@ -7,11 +7,11 @@ 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;
 
-import static net.tylermurphy.hideAndSeek.configuration.Config.errorPrefix;
-import static net.tylermurphy.hideAndSeek.configuration.Config.minPlayers;
+import static net.tylermurphy.hideAndSeek.configuration.Config.*;
 import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
 
 public class Start implements ICommand {
@@ -33,19 +33,29 @@ 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));
+		};
+
+        List<Player> initialSeekers = new ArrayList<>();
+        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;
+            }
+            initialSeekers.add(seeker);
+        }
+        
+        int minHiders = minPlayers - startingSeekerCount;
+        if (Main.getInstance().getBoard().size() - initialSeekers.size() < minHiders) {
+			sender.sendMessage(errorPrefix + message("START_MIN_PLAYERS").addAmount(minPlayers));
 			return;
-		}
-		Main.getInstance().getGame().start(seeker);
+        }
+
+		Main.getInstance().getGame().start(initialSeekers);
 	}
 	
 	public String getLabel() {
@@ -53,18 +63,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)
 			);