2 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
index 4dd5fa9..0e54184 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
@@ -330,7 +330,7 @@ public class Game {
 	}
 
 	public boolean checkCurrentMap() {
-		if(currentMap != null) return false;
+		if(currentMap != null && !currentMap.isNotSetup()) return false;
 		this.currentMap = Maps.getRandomMap();
 		return this.currentMap == null;
 	}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/listener/InventoryHandler.java b/src/main/java/net/tylermurphy/hideAndSeek/game/listener/InventoryHandler.java
index af915e2..0f306b1 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/listener/InventoryHandler.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/listener/InventoryHandler.java
@@ -82,12 +82,13 @@ public class InventoryHandler implements Listener {
         String mapName;
         if(Main.getInstance().supports(14)){
             test = event.getView().getTitle().startsWith("Select a Block: ");
+            if(!test) return;
             mapName = event.getView().getTitle().substring("Select a Block: ".length());
         } else {
             test = event.getInventory().getName().startsWith("Select a Block: ");
+            if(!test) return;
             mapName = event.getInventory().getName().substring("Select a Block: ".length());
         }
-        if(!test) return;
         event.setCancelled(true);
         Map map = Maps.getMap(mapName);
         if(map == null) return;
@@ -105,12 +106,13 @@ public class InventoryHandler implements Listener {
         String mapName;
         if(Main.getInstance().supports(14)){
             test = event.getView().getTitle().startsWith("Select a Block: ");
+            if(!test) return;
             mapName = event.getView().getTitle().substring("Select a Block: ".length());
         } else {
             test = event.getInventory().getName().startsWith("Select a Block: ");
+            if(!test) return;
             mapName = event.getInventory().getName().substring("Select a Block: ".length());
         }
-        if(!test) return;
         Map map = Maps.getMap(mapName);
         if(map == null) return;
         Material mat = map.getBlockHunt().get(0);