1.1.0

4 files changed, 44 insertions, 21 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/commands/About.java b/src/main/java/net/tylermurphy/hideAndSeek/commands/About.java
index 91cc430..7c00369 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/commands/About.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/commands/About.java
@@ -9,7 +9,7 @@ public class About implements ICommand {
 
 	public void execute(CommandSender sender, String[] args) {
 		sender.sendMessage(
-				String.format("%s%sHide and Seek %s(1.0.0%s)\n", ChatColor.AQUA, ChatColor.BOLD, ChatColor.GRAY,ChatColor.WHITE,ChatColor.GRAY) + 
+				String.format("%s%sHide and Seek %s(1.1.0%s)\n", ChatColor.AQUA, ChatColor.BOLD, ChatColor.GRAY,ChatColor.WHITE,ChatColor.GRAY) + 
 				String.format("%sAuthor: %s[KenshinEto]\n", ChatColor.GRAY, ChatColor.WHITE) + 
 				String.format("%sHelp Command: %s/hs %shelp", ChatColor.GRAY, ChatColor.AQUA, ChatColor.WHITE)
 			);
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/commands/SetSpawnLocation.java b/src/main/java/net/tylermurphy/hideAndSeek/commands/SetSpawnLocation.java
index 821d469..b341584 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/commands/SetSpawnLocation.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/commands/SetSpawnLocation.java
@@ -1,6 +1,5 @@
 package net.tylermurphy.hideAndSeek.commands;
 
-import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
@@ -26,8 +25,8 @@ public class SetSpawnLocation implements ICommand {
 		sender.sendMessage(messagePrefix + "Set spawn position to current location");
 		getConfig().set("spawnPosition", newSpawnPosition);
 		saveConfig();
-		Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), String.format("setworldspawn %s %s %s", player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()));
-		Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), String.format("spawnpoint @a %s %s %s", player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()));
+//		Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), String.format("setworldspawn %s %s %s", player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()));
+//		Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), String.format("spawnpoint @a %s %s %s", player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()));
 	}
 
 	public String getLabel() {
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/commands/Start.java b/src/main/java/net/tylermurphy/hideAndSeek/commands/Start.java
index 50dbc4f..d087839 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/commands/Start.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/commands/Start.java
@@ -17,8 +17,6 @@ import net.tylermurphy.hideAndSeek.util.Functions;
 
 import static net.tylermurphy.hideAndSeek.Store.*;
 
-import java.util.HashMap;
-
 public class Start implements ICommand {
 
 	public void execute(CommandSender sender, String[] args) {
@@ -39,8 +37,6 @@ public class Start implements ICommand {
 			return;
 		}
 		
-		Functions.setGamerules();
-		
 		for(Player player : playerList.values()) {
 			player.getInventory().clear();
 			player.setGameMode(GameMode.ADVENTURE);
@@ -49,7 +45,7 @@ public class Start implements ICommand {
 			    player.removePotionEffect(effect.getType());
 			}
 		}
-		Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), String.format("spawnpoint @a %s %s %s", spawnPosition.getBlockX(), spawnPosition.getBlockY(), spawnPosition.getBlockZ()));
+		//Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(), String.format("spawnpoint @a %s %s %s", spawnPosition.getBlockX(), spawnPosition.getBlockY(), spawnPosition.getBlockZ()));
 		for(String playerName : Seeker.getEntries()) {
 			Player player = playerList.get(playerName);
 			if(player != null) {
@@ -65,34 +61,62 @@ public class Start implements ICommand {
 		}
 		WorldborderManager.reset();
 		status = "Starting";
-		Bukkit.getServer().getScheduler().runTaskAsynchronously(Main.plugin, new Runnable(){
+		int temp = gameId;
+		Bukkit.getServer().broadcastMessage(messagePrefix + "Hiders have 30 seconds to hide!");
+		
+		Bukkit.getServer().getScheduler().runTaskLater(Main.plugin, new Runnable() {
 			public void run() {
-				int temp = gameId;
-				Bukkit.getServer().broadcastMessage(messagePrefix + "Hiders have 30 seconds to hide!");
-				try { Thread.sleep(10*1000); } catch (InterruptedException e) {}
 				if(temp != gameId) return;
 				Bukkit.getServer().broadcastMessage(messagePrefix + "Hiders have 20 seconds to hide!");
-				try { Thread.sleep(10*1000); } catch (InterruptedException e) {}
+			}
+		}, 20 * 10);
+		
+		Bukkit.getServer().getScheduler().runTaskLater(Main.plugin, new Runnable() {
+			public void run() {
 				if(temp != gameId) return;
 				Bukkit.getServer().broadcastMessage(messagePrefix + "Hiders have 10 seconds to hide!");
-				try { Thread.sleep(5*1000); } catch (InterruptedException e) {}
+			}
+		}, 20 * 20);
+		
+		Bukkit.getServer().getScheduler().runTaskLater(Main.plugin, new Runnable() {
+			public void run() {
 				if(temp != gameId) return;
 				Bukkit.getServer().broadcastMessage(messagePrefix + "Hiders have 5 seconds to hide!");
-				try { Thread.sleep(2*1000); } catch (InterruptedException e) {}
+			}
+		}, 20 * 25);
+		
+		Bukkit.getServer().getScheduler().runTaskLater(Main.plugin, new Runnable() {
+			public void run() {
 				if(temp != gameId) return;
 				Bukkit.getServer().broadcastMessage(messagePrefix + "Hiders have 3 seconds to hide!");
-				try { Thread.sleep(1*1000); } catch (InterruptedException e) {}
+			}
+		}, 20 * 27);
+		
+		Bukkit.getServer().getScheduler().runTaskLater(Main.plugin, new Runnable() {
+			public void run() {
 				if(temp != gameId) return;
 				Bukkit.getServer().broadcastMessage(messagePrefix + "Hiders have 2 seconds to hide!");
-				try { Thread.sleep(1*1000); } catch (InterruptedException e) {}
+			}
+		}, 20 * 28);
+		
+		Bukkit.getServer().getScheduler().runTaskLater(Main.plugin, new Runnable() {
+			public void run() {
 				if(temp != gameId) return;
 				Bukkit.getServer().broadcastMessage(messagePrefix + "Hiders have 1 seconds to hide!");
-				try { Thread.sleep(1*1000); } catch (InterruptedException e) {}
+			}
+		}, 20 * 29);
+		
+		Bukkit.getServer().getScheduler().runTaskLater(Main.plugin, new Runnable() {
+			public void run() {
 				if(temp != gameId) return;
 				Bukkit.getServer().broadcastMessage(messagePrefix + "Attetion SEEKERS, its time to find the hiders!");
 				status = "Playing";
+				for(Player player : playerList.values()) {
+					Functions.resetPlayer(player);
+				}
 			}
-		});
+		}, 20 * 30);
+		
 		if(worldborderEnabled) {
 			WorldborderManager.schedule();
 		}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/commands/Stop.java b/src/main/java/net/tylermurphy/hideAndSeek/commands/Stop.java
index 71d0035..87abf49 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/commands/Stop.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/commands/Stop.java
@@ -33,6 +33,7 @@ public class Stop implements ICommand {
 	public static void onStop() {
 		if(status.equals("Standby") || status.equals("Setup")) return;
 		status = "Standby";
+		gameId++;
 		for(Player player : playerList.values()) {
 			player.setGameMode(GameMode.ADVENTURE);
 			Hider.addEntry(player.getName());
@@ -44,7 +45,6 @@ public class Stop implements ICommand {
 			player.addPotionEffect(new PotionEffect(PotionEffectType.HEAL, 1, 100));
 		}
 		WorldborderManager.reset();
-		gameId++;
 	}
 	
 	public String getUsage() {