2 files changed, 21 insertions, 14 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/EventListener.java b/src/main/java/net/tylermurphy/hideAndSeek/game/EventListener.java
index e464fba..35089e4 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/EventListener.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/EventListener.java
@@ -61,12 +61,12 @@ public class EventListener implements Listener {
 		if(autoJoin){
 			Game.join(event.getPlayer());
 		} else if(teleportToExit) {
-			if (event.getPlayer().getWorld().getName().equals("hideandseek_" + spawnWorld) || event.getPlayer().getWorld().getName().equals(lobbyWorld)) {
+			if (event.getPlayer().getWorld().getName().equals(Game.getGameWorld()) || event.getPlayer().getWorld().getName().equals(lobbyWorld)) {
 				event.getPlayer().teleport(new Location(Bukkit.getWorld(exitWorld), exitPosition.getX(), exitPosition.getY(), exitPosition.getZ()));
 				event.getPlayer().setGameMode(GameMode.ADVENTURE);
 			}
 		} else {
-			if (event.getPlayer().getWorld().getName().equals("hideandseek_" + spawnWorld)) {
+			if (event.getPlayer().getWorld().getName().equals(Game.getGameWorld())) {
 				if(Game.status != Status.STANDBY){
 					Game.join(event.getPlayer());
 				} else {
@@ -115,10 +115,10 @@ public class EventListener implements Listener {
 
 	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onMove(PlayerMoveEvent event){
-		if(!event.getPlayer().getWorld().getName().equals("hideandseek_" + spawnWorld)) return;
+		if(!event.getPlayer().getWorld().getName().equals(Game.getGameWorld())) return;
 		if(event.getPlayer().hasPermission("hideandseek.leavebounds")) return;
 		if(event.getTo() == null || event.getTo().getWorld() == null) return;
-		if(!event.getTo().getWorld().getName().equals("hideandseek_" + spawnWorld)) return;
+		if(!event.getTo().getWorld().getName().equals(Game.getGameWorld())) return;
 		if(event.getTo().getBlockX() < saveMinX || event.getTo().getBlockX() > saveMaxX || event.getTo().getBlockZ() < saveMinZ || event.getTo().getBlockZ() > saveMaxZ){
 			event.setCancelled(true);
 		}
@@ -211,7 +211,7 @@ public class EventListener implements Listener {
 					} else {
 						player.setHealth(player.getMaxHealth());
 					}
-					player.teleport(new Location(Bukkit.getWorld("hideandseek_" + spawnWorld), spawnPosition.getX(), spawnPosition.getY(), spawnPosition.getZ()));
+					player.teleport(new Location(Bukkit.getWorld(Game.getGameWorld()), spawnPosition.getX(), spawnPosition.getY(), spawnPosition.getZ()));
 					if(Version.atLeast("1.9")){
 						XSound.ENTITY_PLAYER_DEATH.play(player, 1, 1);
 					} else {
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
index d61d11f..16caee4 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
@@ -89,7 +89,7 @@ public class Game {
 
 	public static void start(Player seeker){
 		if(status == Status.STARTING || status == Status.PLAYING) return;
-		if(worldLoader.getWorld() != null) {
+		if(mapSaveEnabled && worldLoader.getWorld() != null) {
 			worldLoader.rollback();
 		} else {
 			worldLoader.loadMap();
@@ -105,7 +105,7 @@ public class Game {
 		for(Player player : Board.getPlayers()) {
 			player.getInventory().clear();
 			player.setGameMode(GameMode.ADVENTURE);
-			player.teleport(new Location(Bukkit.getWorld("hideandseek_"+spawnWorld), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ()));
+			player.teleport(new Location(Bukkit.getWorld(getGameWorld()), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ()));
 			for(PotionEffect effect : player.getActivePotionEffects()){
 				player.removePotionEffect(effect.getType());
 			}
@@ -125,7 +125,7 @@ public class Game {
 		if (glowEnabled)
 			glow = new Glow();
 		worldBorder = new Border();
-		worldBorder.resetWorldborder("hideandseek_"+spawnWorld);
+		worldBorder.resetWorldborder(getGameWorld());
 		if(gameLength > 0)
 			timeLeft = gameLength;
 		for(Player player : Board.getPlayers())
@@ -184,7 +184,7 @@ public class Game {
 			winners.add(Board.getFirstSeeker().getUniqueId());
 			Database.playerInfo.addWins(players, winners, type);
 		}
-		worldBorder.resetWorldborder("hideandseek_"+spawnWorld);
+		worldBorder.resetWorldborder(getGameWorld());
 		for(Player player : Board.getPlayers()) {
 			if(Version.atLeast("1.9")){
 				for(Player temp : Board.getPlayers()) {
@@ -220,7 +220,7 @@ public class Game {
 			}
 		}
 		EventListener.temp_loc.clear();
-		worldLoader.unloadMap();
+		if(mapSaveEnabled) worldLoader.unloadMap();
 		Board.reloadLobbyBoards();
 	}
 
@@ -228,11 +228,18 @@ public class Game {
 		if(spawnPosition.getBlockX() == 0 && spawnPosition.getBlockY() == 0 && spawnPosition.getBlockZ() == 0) return true;
 		if(lobbyPosition.getBlockX() == 0 && lobbyPosition.getBlockY() == 0 && lobbyPosition.getBlockZ() == 0) return true;
 		if(exitPosition.getBlockX() == 0 && exitPosition.getBlockY() == 0 && exitPosition.getBlockZ() == 0) return true;
-		File destenation = new File(Main.root+File.separator+"hideandseek_"+spawnWorld);
-		if(!destenation.exists()) return true;
+		if(mapSaveEnabled) {
+			File destenation = new File(Main.root + File.separator + getGameWorld());
+			if (!destenation.exists()) return true;
+		}
 		return saveMinX == 0 || saveMinZ == 0 || saveMaxX == 0 || saveMaxZ == 0;
 	}
 
+	public static String getGameWorld(){
+		if(mapSaveEnabled) return "hideandseek_"+spawnWorld;
+		else return spawnWorld;
+	}
+
 	public static void onTick() {
 		if(isNotSetup()) return;
 		if(status == Status.STANDBY) whileWaiting();
@@ -294,7 +301,7 @@ public class Game {
 			player.sendMessage(messagePrefix + message("GAME_JOIN_SPECTATOR"));
 			player.setGameMode(GameMode.SPECTATOR);
 			Board.createGameBoard(player);
-			player.teleport(new Location(Bukkit.getWorld("hideandseek_"+spawnWorld), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ()));
+			player.teleport(new Location(Bukkit.getWorld(getGameWorld()), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ()));
 			Titles.sendTitle(player, 10, 70, 20, ChatColor.GRAY + "" + ChatColor.BOLD + "SPECTATING", ChatColor.WHITE + message("SPECTATOR_SUBTITLE").toString());
 		}
 
@@ -601,7 +608,7 @@ class Border {
 		running = true;
 		broadcastMessage(worldborderPrefix + message("WORLDBORDER_DECREASING").addAmount(change));
 		currentWorldborderSize -= worldborderChange;
-		World world = Bukkit.getWorld("hideandseek_"+spawnWorld);
+		World world = Bukkit.getWorld(Game.getGameWorld());
 		assert world != null;
 		org.bukkit.WorldBorder border = world.getWorldBorder();
 		border.setSize(border.getSize()-change,30);