1 files changed, 20 insertions, 4 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java
index 7b219a7..69387cd 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Join.java
@@ -20,17 +20,19 @@
 package net.tylermurphy.hideAndSeek.command;
 
 import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.command.util.Command;
+import net.tylermurphy.hideAndSeek.command.util.ICommand;
+import net.tylermurphy.hideAndSeek.configuration.Maps;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static net.tylermurphy.hideAndSeek.configuration.Config.errorPrefix;
 import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
 
-public class Join extends Command {
+public class Join implements ICommand {
 
 	public void execute(Player sender, String[] args) {
 		if (Main.getInstance().getGame().checkCurrentMap()) {
@@ -46,7 +48,18 @@ public class Join extends Command {
 			sender.sendMessage(errorPrefix + message("GAME_INGAME"));
 			return;
 		}
-
+		if(args.length > 0) {
+			if(Main.getInstance().getBoard().size() > 0) {
+				sender.sendMessage(errorPrefix + message("LOBBY_IN_USE"));
+				return;
+			}
+			net.tylermurphy.hideAndSeek.configuration.Map map = Maps.getMap(args[0]);
+			if(map == null) {
+				sender.sendMessage(errorPrefix + message("INVALID_MAP"));
+				return;
+			}
+			Main.getInstance().getGame().setCurrentMap(map);
+		}
 		Main.getInstance().getGame().join(player);
 	}
 
@@ -55,7 +68,7 @@ public class Join extends Command {
 	}
 
 	public String getUsage() {
-		return "";
+		return "<*map>";
 	}
 
 	public String getDescription() {
@@ -63,6 +76,9 @@ public class Join extends Command {
 	}
 
 	public List<String> autoComplete(@NotNull String parameter, @NotNull String typed) {
+		if(parameter.equals("*map")) {
+			return Maps.getAllMaps().stream().map(net.tylermurphy.hideAndSeek.configuration.Map::getName).collect(Collectors.toList());
+		}
 		return null;
 	}