1 files changed, 35 insertions, 18 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Debug.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Debug.java
index 61d0c46..2ca998e 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/Debug.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Debug.java
@@ -2,11 +2,10 @@ package net.tylermurphy.hideAndSeek.command;
 
 import com.cryptomorin.xseries.XMaterial;
 import net.tylermurphy.hideAndSeek.Main;
+import net.tylermurphy.hideAndSeek.configuration.Maps;
 import net.tylermurphy.hideAndSeek.game.PlayerLoader;
 import net.tylermurphy.hideAndSeek.game.util.Status;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
@@ -18,7 +17,7 @@ import java.util.Map;
 import java.util.function.Consumer;
 
 import static net.tylermurphy.hideAndSeek.configuration.Config.*;
-import static net.tylermurphy.hideAndSeek.configuration.Config.exitPosition;
+import static net.tylermurphy.hideAndSeek.configuration.Localization.message;
 
 public class Debug implements ICommand {
 
@@ -26,41 +25,43 @@ public class Debug implements ICommand {
     private Inventory debugMenu;
 
     public void execute(Player sender, String[] args) {
-        if(debugMenu == null) createMenu();
+        if(args.length < 1) args = new String[]{""};
+        if(debugMenu == null) createMenu(args[0]);
         sender.openInventory(debugMenu);
     }
 
-    private void createMenu(){
+    private void createMenu(String mapname){
+        net.tylermurphy.hideAndSeek.configuration.Map map = Maps.getMap(mapname);
         debugMenu = Main.getInstance().getServer().createInventory(null, 18, "Debug Menu");
         debugMenu.setItem(0, createOption(0, XMaterial.LEATHER_CHESTPLATE.parseMaterial(), "&6Become a &lHider", 1, player -> {
             if(mapSaveEnabled) {
-                if(Bukkit.getWorld(Main.getInstance().getGame().getGameWorld()) == null) Main.getInstance().getGame().getWorldLoader().loadMap();
+                if(Main.getInstance().getGame().getCurrentMap().getSpawn().getWorld() == null) Main.getInstance().getGame().getCurrentMap().getWorldLoader().loadMap();
             }
             Main.getInstance().getBoard().addHider(player);
-            PlayerLoader.loadHider(player, Main.getInstance().getGame().getGameWorld());
+            PlayerLoader.loadHider(player, Main.getInstance().getGame().getCurrentMap());
             if(Main.getInstance().getGame().getStatus() != Status.STARTING)
                 PlayerLoader.resetPlayer(player, Main.getInstance().getBoard());
         }));
         debugMenu.setItem(1, createOption(1, XMaterial.GOLDEN_CHESTPLATE.parseMaterial(), "&cBecome a &lSeeker", 1, player -> {
             if(mapSaveEnabled) {
-                if(Bukkit.getWorld(Main.getInstance().getGame().getGameWorld()) == null) Main.getInstance().getGame().getWorldLoader().loadMap();
+                if(Main.getInstance().getGame().getCurrentMap().getSpawn().getWorld() == null) Main.getInstance().getGame().getCurrentMap().getWorldLoader().loadMap();
             }
             Main.getInstance().getBoard().addSeeker(player);
-            PlayerLoader.loadSeeker(player, Main.getInstance().getGame().getGameWorld());
+            PlayerLoader.loadSeeker(player, Main.getInstance().getGame().getCurrentMap());
             if(Main.getInstance().getGame().getStatus() != Status.STARTING)
                 PlayerLoader.resetPlayer(player, Main.getInstance().getBoard());
         }));
         debugMenu.setItem(2, createOption(2, XMaterial.IRON_CHESTPLATE.parseMaterial(), "&8Become a &lSpectator", 1, player -> {
             if(mapSaveEnabled) {
-                if(Bukkit.getWorld(Main.getInstance().getGame().getGameWorld()) == null) Main.getInstance().getGame().getWorldLoader().loadMap();
+                if(Main.getInstance().getGame().getCurrentMap().getSpawn().getWorld() == null) Main.getInstance().getGame().getCurrentMap().getWorldLoader().loadMap();
             }
             Main.getInstance().getBoard().addSpectator(player);
-            PlayerLoader.loadSpectator(player, Main.getInstance().getGame().getGameWorld());
+            PlayerLoader.loadSpectator(player, Main.getInstance().getGame().getCurrentMap());
         }));
         debugMenu.setItem(3, createOption(3, XMaterial.BARRIER.parseMaterial(), "&cUnload from Game", 1, player -> {
             Main.getInstance().getBoard().remove(player);
             PlayerLoader.unloadPlayer(player);
-            player.teleport(new Location(Bukkit.getWorld(exitWorld), exitPosition.getX(), exitPosition.getY(), exitPosition.getZ()));
+            player.teleport(exitPosition);
         }));
         debugMenu.setItem(4, createOption(4, XMaterial.BARRIER.parseMaterial(), "&cDie In Game", 2, player -> {
             if((Main.getInstance().getBoard().isSeeker(player) || Main.getInstance().getBoard().isHider(player)) && Main.getInstance().getGame().getStatus() == Status.PLAYING){
@@ -68,14 +69,30 @@ public class Debug implements ICommand {
             }
         }));
         debugMenu.setItem(6, createOption(6, Material.ENDER_PEARL, "&d&lTeleport: &fGame spawn", 1, player -> {
+            if(map == null) {
+                player.sendMessage(errorPrefix + message("INVALID_MAP"));
+                return;
+            }
             if(mapSaveEnabled) {
-                if(Bukkit.getWorld(Main.getInstance().getGame().getGameWorld()) == null) Main.getInstance().getGame().getWorldLoader().loadMap();
+                if(map.getSpawn().getWorld() == null) map.getWorldLoader().loadMap();
+            }
+            player.teleport(map.getSpawn());
+        }));
+        debugMenu.setItem(7, createOption(7, Material.ENDER_PEARL, "&d&lTeleport: &fLobby", 2, player -> {
+            if(map == null) {
+                player.sendMessage(errorPrefix + message("INVALID_MAP"));
+                return;
+            }
+            player.teleport(map.getLobby());
+        }));
+        debugMenu.setItem(8, createOption(8, Material.ENDER_PEARL, "&d&lTeleport: &fExit", 3,  player -> player.teleport(exitPosition)));
+        debugMenu.setItem(9, createOption(9, XMaterial.GLASS.parseMaterial(), "&dEnable Disguise", 1,  player -> {
+            if(map == null) {
+                player.sendMessage(errorPrefix + message("INVALID_MAP"));
+                return;
             }
-            player.teleport(new Location(Bukkit.getWorld(Main.getInstance().getGame().getGameWorld()), spawnPosition.getX(), spawnPosition.getY(), spawnPosition.getZ()));
+            PlayerLoader.openBlockHuntPicker(player, map);
         }));
-        debugMenu.setItem(7, createOption(7, Material.ENDER_PEARL, "&d&lTeleport: &fLobby", 2, player -> player.teleport(new Location(Bukkit.getWorld(lobbyWorld), lobbyPosition.getX(), lobbyPosition.getY(), lobbyPosition.getZ()))));
-        debugMenu.setItem(8, createOption(8, Material.ENDER_PEARL, "&d&lTeleport: &fExit", 3, player -> player.teleport(new Location(Bukkit.getWorld(exitWorld), exitPosition.getX(), exitPosition.getY(), exitPosition.getZ()))));
-        debugMenu.setItem(9, createOption(9, XMaterial.GLASS.parseMaterial(), "&dEnable Disguise", 1, PlayerLoader::openBlockHuntPicker));
         debugMenu.setItem(10, createOption(10, XMaterial.PLAYER_HEAD.parseMaterial(), "&dDisable Disguise", 1, player -> Main.getInstance().getDisguiser().reveal(player)));
     }
 
@@ -100,7 +117,7 @@ public class Debug implements ICommand {
     }
 
     public String getUsage() {
-        return "";
+        return "<*map>";
     }
 
     public String getDescription() {