1.3.3 beta 3

1 files changed, 14 insertions, 8 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/SetSpawnLocation.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SetSpawnLocation.java
index c854b60..eb03625 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/SetSpawnLocation.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SetSpawnLocation.java
@@ -2,23 +2,21 @@ package net.tylermurphy.hideAndSeek.command;
 
 import static net.tylermurphy.hideAndSeek.configuration.Config.*;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import net.tylermurphy.hideAndSeek.game.Status;
+import net.tylermurphy.hideAndSeek.game.Game;
+import net.tylermurphy.hideAndSeek.util.Status;
+import net.tylermurphy.hideAndSeek.world.WorldLoader;
+import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
-import net.tylermurphy.hideAndSeek.Main;
-
 import static net.tylermurphy.hideAndSeek.configuration.Config.addToConfig;
 import static net.tylermurphy.hideAndSeek.configuration.Localization.*;
 
 public class SetSpawnLocation implements ICommand {
 
 	public void execute(CommandSender sender, String[] args) {
-		if(Main.plugin.status != Status.STANDBY) {
+		if(Game.status != Status.STANDBY) {
 			sender.sendMessage(errorPrefix + message("GAME_INPROGRESS"));
 			return;
 		}
@@ -35,7 +33,15 @@ public class SetSpawnLocation implements ICommand {
 			sender.sendMessage(errorPrefix + message("WORLDBORDER_POSITION"));
 			return;
 		}
-		spawnWorld = player.getLocation().getWorld().getName();
+		World world = player.getLocation().getWorld();
+		if(world == null){
+			throw new RuntimeException("Unable to get world: " + spawnWorld);
+		}
+		if(!world.getName().equals(spawnWorld)){
+			Game.worldLoader.unloadMap();
+			Game.worldLoader = new WorldLoader(world.getName());
+		}
+		spawnWorld = world.getName();
 		spawnPosition = newSpawnPosition;
 		sender.sendMessage(messagePrefix + message("GAME_SPAWN"));
 		addToConfig("spawns.game.x", spawnPosition.getX());