8 files changed, 47 insertions, 84 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/commands/About.java b/src/main/java/net/tylermurphy/hideAndSeek/command/About.java
index 76cd28b..3c4a8f0 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/commands/About.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/About.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.commands;
+package net.tylermurphy.hideAndSeek.command;
 
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/commands/Help.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Help.java
index a998a11..f33717e 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/commands/Help.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Help.java
@@ -1,9 +1,9 @@
-package net.tylermurphy.hideAndSeek.commands;
+package net.tylermurphy.hideAndSeek.command;
 
 import org.bukkit.command.CommandSender;
 
 import net.md_5.bungee.api.ChatColor;
-import net.tylermurphy.hideAndSeek.CommandHandler;
+import net.tylermurphy.hideAndSeek.bukkit.CommandHandler;
 import net.tylermurphy.hideAndSeek.util.ICommand;
 
 public class Help implements ICommand {
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/commands/Reload.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java
index 04128c5..1b1f1d5 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/commands/Reload.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Reload.java
@@ -1,8 +1,9 @@
-package net.tylermurphy.hideAndSeek.commands;
+package net.tylermurphy.hideAndSeek.command;
 
 import org.bukkit.command.CommandSender;
 
 import net.tylermurphy.hideAndSeek.Store;
+import net.tylermurphy.hideAndSeek.util.Functions;
 import net.tylermurphy.hideAndSeek.util.ICommand;
 
 import static net.tylermurphy.hideAndSeek.Store.*;
@@ -11,6 +12,9 @@ public class Reload implements ICommand {
 
 	public void execute(CommandSender sender, String[] args) {
 		Store.loadConfig();
+		try {
+			Functions.loadScoreboard();
+		} catch(Exception e) {}
 		sender.sendMessage(messagePrefix + "Reloaded the config");
 	}
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/commands/SaveMap.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SaveMap.java
index 37ead8a..2956c80 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/commands/SaveMap.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SaveMap.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.commands;
+package net.tylermurphy.hideAndSeek.command;
 
 import static net.tylermurphy.hideAndSeek.Store.*;
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/commands/SetBorder.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SetBorder.java
index ae99c7a..e8ad2c9 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/commands/SetBorder.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SetBorder.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.commands;
+package net.tylermurphy.hideAndSeek.command;
 
 import static net.tylermurphy.hideAndSeek.Store.*;
 
@@ -30,7 +30,7 @@ public class SetBorder implements ICommand {
 			addToSection("worldBorder",temp);
 			saveConfig();
 			sender.sendMessage(messagePrefix + "Disabled worldborder.");
-			Functions.resetWorldborder();
+			Functions.resetWorldborder(spawnWorld);
 			return;
 		}
 		int num,delay;
@@ -68,7 +68,7 @@ public class SetBorder implements ICommand {
 		addToSection("worldBorder",temp);
 		sender.sendMessage(messagePrefix + "Set border center to current location, size to "+num+", and delay to "+delay);
 		saveConfig();
-		Functions.resetWorldborder();
+		Functions.resetWorldborder(spawnWorld);
 	}
 
 	public String getLabel() {
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/commands/SetSpawnLocation.java b/src/main/java/net/tylermurphy/hideAndSeek/command/SetSpawnLocation.java
index 18e3703..62d6bc9 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/commands/SetSpawnLocation.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/SetSpawnLocation.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.commands;
+package net.tylermurphy.hideAndSeek.command;
 
 import static net.tylermurphy.hideAndSeek.Store.*;
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/commands/Start.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Start.java
index a8eec85..a49ce41 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/commands/Start.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Start.java
@@ -1,7 +1,6 @@
-package net.tylermurphy.hideAndSeek.commands;
+package net.tylermurphy.hideAndSeek.command;
 
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
@@ -10,12 +9,16 @@ import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
 import net.tylermurphy.hideAndSeek.Main;
+import net.tylermurphy.hideAndSeek.events.Glow;
+import net.tylermurphy.hideAndSeek.events.Taunt;
+import net.tylermurphy.hideAndSeek.events.Worldborder;
 import net.tylermurphy.hideAndSeek.util.Functions;
 import net.tylermurphy.hideAndSeek.util.ICommand;
 
 import static net.tylermurphy.hideAndSeek.Store.*;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Random;
 
 public class Start implements ICommand {
@@ -55,10 +58,17 @@ public class Start implements ICommand {
 			sender.sendMessage(errorPrefix + "Invalid player: " + seekerName);
 			return;
 		}
+		Hider = new ArrayList<String>();
+		Seeker = new ArrayList<String>();
+		Spectator = new ArrayList<String>();
 		for(Player temp : playerList.values()) {
-			Hider.addEntry(temp.getName());
+			if(temp.getName().equals(seeker.getName()))
+				continue;
+			Hider.add(temp.getName());
+			HiderTeam.addEntry(temp.getName());
 		}
-		Seeker.addEntry(seeker.getName());
+		Seeker.add(seeker.getName());
+		SeekerTeam.addEntry(seeker.getName());
 		
 		for(Player player : playerList.values()) {
 			player.getInventory().clear();
@@ -68,21 +78,20 @@ 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()));
-		for(String playerName : Seeker.getEntries()) {
+		for(String playerName : Seeker) {
 			Player player = playerList.get(playerName);
 			if(player != null) {
 				player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS,1000000,127,false,false));
 				player.addPotionEffect(new PotionEffect(PotionEffectType.SLOW,1000000,127,false,false));
 			}
 		}
-		for(String playerName : Hider.getEntries()) {
+		for(String playerName : Hider) {
 			Player player = playerList.get(playerName);
 			if(player != null) {
 				player.addPotionEffect(new PotionEffect(PotionEffectType.SPEED,1000000,5,false,false));
 			}
 		}
-		Functions.resetWorldborder();
+		Functions.resetWorldborder("hideandseek_"+spawnWorld);
 		status = "Starting";
 		int temp = gameId;
 		Bukkit.getServer().broadcastMessage(messagePrefix + "Hiders have 30 seconds to hide!");
@@ -137,75 +146,24 @@ public class Start implements ICommand {
 				for(Player player : playerList.values()) {
 					Functions.resetPlayer(player);
 				}
+				Main.worldborder = null;
+				Main.taunt = null;
+				Main.glow = null;
+				
+				if(worldborderEnabled) {
+					Main.worldborder = new Worldborder(gameId);
+					Main.worldborder.schedule();
+				}
+				
+				Main.taunt = new Taunt(gameId);
+				Main.taunt.schedule();
+				
+				Main.glow = new Glow(gameId);
 			}
 		}, 20 * 30);
 		
-		if(worldborderEnabled) {
-			scheduleWorldborder();
-		}
-		scheduleTaunt();
-		
-	}
-	
-	private static void scheduleTaunt() {
-		Bukkit.getServer().getScheduler().runTaskAsynchronously(Main.plugin, new Runnable(){
-
-			public void run() {
-				int temp = gameId;
-				while(true) {
-					if(tauntPlayer != null && !tauntPlayer.equals("")) {
-						try { Thread.sleep(1000); } catch (InterruptedException e) {}
-						if(gameId != temp) break;
-						continue;
-					}
-					try { Thread.sleep(1000*60); } catch (InterruptedException e) {}
-					if(gameId != temp) break;
-					if(Math.random() > .8) {
-						Player taunted = null;
-						int rand = (int) (Math.random()*Hider.getEntries().size());
-						for(Player player : playerList.values()) {
-							if(Hider.hasEntry(player.getName())) {
-								rand--;
-								if(rand==0) {
-									taunted = player;
-									break;
-								}
-							}
-						}
-						if(taunted != null) {
-							taunted.sendMessage(ChatColor.RED + "" + ChatColor.ITALIC + "Oh no! You have been chosed to be taunted.");
-							Bukkit.getServer().broadcastMessage(tauntPrefix + " A random hider will be taunted in the next 30s");
-							try { Thread.sleep(1000*30); } catch (InterruptedException e) {}
-							if(gameId != temp) break;
-							tauntPlayer = taunted.getName();
-						}
-					}
-				}
-			}
-		});
 	}
 	
-	private static void scheduleWorldborder() {
-		
-		Bukkit.getServer().getScheduler().runTaskAsynchronously(Main.plugin, new Runnable(){
-
-			public void run() {
-				int temp = gameId;
-				while(true) {
-					try { Thread.sleep(1000*60*worldborderDelay); } catch (InterruptedException e) {}
-					if(gameId != temp) break;
-					if(currentWorldborderSize-100 > 100) {
-						Bukkit.getServer().broadcastMessage(worldborderPrefix + "Worldborder decreacing by 100 blocks over the next 30s");
-						currentWorldborderSize -= 100;
-						decreaseBorder = true;
-					} else {
-						break;
-					}
-				}
-			}
-		});
-	}
-
 	public String getLabel() {
 		return "start";
 	}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/commands/Stop.java b/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java
index b709120..c956d3d 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/commands/Stop.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/Stop.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.commands;
+package net.tylermurphy.hideAndSeek.command;
 
 import static net.tylermurphy.hideAndSeek.Store.*;
 
@@ -35,9 +35,11 @@ public class Stop implements ICommand {
 		if(status.equals("Standby")) return;
 		status = "Standby";
 		gameId++;
+		Functions.resetWorldborder("hideandseek_"+spawnWorld);
 		for(Player player : playerList.values()) {
 			player.setGameMode(GameMode.ADVENTURE);
-			Hider.addEntry(player.getName());
+			Hider.add(player.getName());
+			HiderTeam.addEntry(player.getName());
 			player.getInventory().clear();
 			player.teleport(new Location(Bukkit.getWorld(spawnWorld), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ()));
 			for(PotionEffect effect : player.getActivePotionEffects()){
@@ -48,7 +50,6 @@ public class Stop implements ICommand {
 				Packet.setGlow(player, temp, false);
 			}
 		}
-		Functions.resetWorldborder();
 	}
 	
 	public String getUsage() {