1 files changed, 23 insertions, 6 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/map/blockhunt/Enabled.java b/src/main/java/net/tylermurphy/hideAndSeek/command/map/blockhunt/Enabled.java
index 9d47390..b8d2e15 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/map/blockhunt/Enabled.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/map/blockhunt/Enabled.java
@@ -1,21 +1,38 @@
 package net.tylermurphy.hideAndSeek.command.map.blockhunt;
 
-import net.tylermurphy.hideAndSeek.command.location.LocationUtils;
-import net.tylermurphy.hideAndSeek.command.location.Locations;
+import net.tylermurphy.hideAndSeek.Main;
 import net.tylermurphy.hideAndSeek.command.util.Command;
+import net.tylermurphy.hideAndSeek.configuration.Map;
 import net.tylermurphy.hideAndSeek.configuration.Maps;
+import net.tylermurphy.hideAndSeek.game.util.Status;
+import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static net.tylermurphy.hideAndSeek.configuration.Config.errorPrefix;
+import static net.tylermurphy.hideAndSeek.configuration.Config.messagePrefix;
+import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
+
 public class Enabled extends Command {
 
     public void execute(Player sender, String[] args) {
-        LocationUtils.setLocation(sender, Locations.LOBBY, args[0], map -> {
-            map.setLobby(sender.getLocation());
-        });
+        if (Main.getInstance().getGame().getStatus() != Status.STANDBY) {
+            sender.sendMessage(errorPrefix + message("GAME_INPROGRESS"));
+            return;
+        }
+        Map map = Maps.getMap(args[0]);
+        if(map == null) {
+            sender.sendMessage(errorPrefix + message("INVALID_MAP"));
+            return;
+        }
+        boolean bool = Boolean.parseBoolean(args[1]);
+        map.setBlockhunt(bool, map.getBlockHunt());
+        Maps.setMap(map.getName(), map);
+        sender.sendMessage(messagePrefix + message("BLOCKHUNT_SET_TO")
+                .addAmount(bool ? ChatColor.GREEN + "true" : ChatColor.RED + "false") + ChatColor.WHITE);
     }
 
     public String getLabel() {
@@ -27,7 +44,7 @@ public class Enabled extends Command {
     }
 
     public String getDescription() {
-        return "Sets hide and seeks lobby location to current position";
+        return "Sets blockhunt enabled or disabled in a current map";
     }
 
     public List<String> autoComplete(String parameter) {