1.3.0 final beta

2 files changed, 2 insertions, 1 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java
index 908df5e..4144da7 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Leave.java
@@ -28,9 +28,9 @@ public class Leave implements ICommand {
 		}
 		if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(messagePrefix + sender.getName() + " has left the HideAndSeek lobby");
 		else Util.broadcastMessage(messagePrefix + sender.getName() + " has left the HideAndSeek lobby");
+		Main.plugin.board.removeBoard(player);
 		Main.plugin.board.remove(player);
 		player.teleport(new Location(Bukkit.getWorld(exitWorld), exitPosition.getX(), exitPosition.getY(), exitPosition.getZ()));
-		Main.plugin.board.removeBoard(player);
 		if(Main.plugin.status.equals("Standby")) {
 			Main.plugin.board.reloadLobbyBoards();
 		} else {
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java
index 416d673..e2cb563 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java
@@ -41,6 +41,7 @@ public class Stop implements ICommand {
 		if(Main.plugin.status.equals("Standby")) return;
 		Main.plugin.status = "Standby";
 		Main.plugin.gameId++;
+		Main.plugin.timeLeft = 0;
 		Worldborder.resetWorldborder("hideandseek_"+spawnWorld);
 		for(Player player : Main.plugin.board.getPlayers()) {
 			player.setGameMode(GameMode.ADVENTURE);