1.3.3 beta 3

9 files changed, 22 insertions, 564 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/Board.java b/src/main/java/net/tylermurphy/hideAndSeek/util/Board.java
deleted file mode 100644
index 6b61f16..0000000
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/Board.java
+++ /dev/null
@@ -1,249 +0,0 @@
-package net.tylermurphy.hideAndSeek.util;
-
-import static net.tylermurphy.hideAndSeek.configuration.Config.*;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import net.tylermurphy.hideAndSeek.game.Status;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.scoreboard.DisplaySlot;
-import org.bukkit.scoreboard.Objective;
-import org.bukkit.scoreboard.Score;
-import org.bukkit.scoreboard.Scoreboard;
-import org.bukkit.scoreboard.Team;
-import org.bukkit.scoreboard.Team.Option;
-import org.bukkit.scoreboard.Team.OptionStatus;
-
-import net.tylermurphy.hideAndSeek.Main;
-
-public class Board {
-
-	private List<String> Hider, Seeker, Spectator;
-	private Map<String, Player> playerList = new HashMap<>();
-	private Map<String, CustomBoard> customBoards = new HashMap<>();
-
-	public boolean isPlayer(Player player) {
-		return playerList.containsKey(player.getName());
-	}
-	
-	public boolean isPlayer(CommandSender sender) {
-		return playerList.containsKey(sender.getName());
-	}
-	
-	public boolean isHider(Player player) {
-		return Hider.contains(player.getName());
-	}
-	
-	public boolean isSeeker(Player player) {
-		return Seeker.contains(player.getName());
-	}
-	
-	public boolean isSpectator(Player player) {
-		return Spectator.contains(player.getName());
-	}
-	
-	public int sizeHider() {
-		return Hider.size();
-	}
-	
-	public int sizeSeeker() {
-		return Seeker.size();
-	}
-	
-	public int sizeSpectator() {
-		return Spectator.size();
-	}
-	
-	public int size() {
-		return playerList.values().size();
-	}
-	
-	public List<Player> getHiders(){
-		return Hider.stream().map(playerName -> playerList.get(playerName)).collect(Collectors.toList());
-	}
-	
-	public List<Player> getSeekers(){
-		return Seeker.stream().map(playerName -> playerList.get(playerName)).collect(Collectors.toList());
-	}
-
-	public Player getFirstSeeker(){
-		return playerList.get(Seeker.get(0));
-	}
-	
-	public List<Player> getSpectators(){
-		return Spectator.stream().map(playerName -> playerList.get(playerName)).collect(Collectors.toList());
-	}
-	
-	public List<Player> getPlayers(){
-		return new ArrayList<Player>(playerList.values());
-	}
-	
-	public Player getPlayer(String name) {
-		return playerList.get(name);
-	}
-	
-	public void addHider(Player player) {
-		Hider.add(player.getName());
-		Seeker.remove(player.getName());
-		Spectator.remove(player.getName());
-		playerList.put(player.getName(), player);
-	}
-	
-	public void addSeeker(Player player) {
-		Hider.remove(player.getName());
-		Seeker.add(player.getName());
-		Spectator.remove(player.getName());
-		playerList.put(player.getName(), player);
-	}
-	
-	public void addSpectator(Player player) {
-		Hider.remove(player.getName());
-		Seeker.remove(player.getName());
-		Spectator.add(player.getName());
-		playerList.put(player.getName(), player);
-	}
-	
-	public void remove(Player player) {
-		Hider.remove(player.getName());
-		Seeker.remove(player.getName());
-		Spectator.remove(player.getName());
-		playerList.remove(player.getName());
-	}
-	
-	public boolean onSameTeam(Player player1, Player player2) {
-		if(Hider.contains(player1.getName()) && Hider.contains(player2.getName())) return true;
-		else if(Seeker.contains(player1.getName()) && Seeker.contains(player2.getName())) return true;
-		else if(Spectator.contains(player1.getName()) && Spectator.contains(player2.getName())) return true;
-		else return false;
-	}
-	
-	public void reload() {
-		Hider = new ArrayList<>();
-		Seeker = new ArrayList<>();
-		Spectator = new ArrayList<>();
-	}
-
-	public void createLobbyBoard(Player player) {
-		createLobbyBoard(player, true);
-	}
-
-	private void createLobbyBoard(Player player, boolean recreate) {
-		CustomBoard board = customBoards.get(player.getName());
-		if(recreate) {
-			board = new CustomBoard(player, "&l&eHIDE AND SEEK");
-			board.updateTeams();
-		}
-		board.setLine("hiders", ChatColor.BOLD + "" + ChatColor.YELLOW + "HIDER %" + ChatColor.WHITE + getHiderPercent());
-		board.setLine("seekers", ChatColor.BOLD + "" + ChatColor.RED + "SEEKER %" + ChatColor.WHITE + getSeekerPercent());
-		board.addBlank();
-		board.setLine("players", "Players: " + playerList.values().size());
-		board.addBlank();
-		if(lobbyCountdownEnabled){
-			if(Main.plugin.game.countdownTime == -1){
-				board.setLine("waiting", "Waiting for players...");
-			} else {
-				board.setLine("waiting", "Starting in: "+ChatColor.GREEN + Main.plugin.game.countdownTime+"s");
-			}
-		} else {
-			board.setLine("waiting", "Waiting for gamemaster...");
-		}
-		board.display();
-		customBoards.put(player.getName(), board);
-	}
-
-	public void createGameBoard(Player player){
-		createGameBoard(player, true);
-	}
-
-	private void createGameBoard(Player player, boolean recreate){
-		CustomBoard board = customBoards.get(player.getName());
-		if(recreate) {
-			board = new CustomBoard(player, "&l&eHIDE AND SEEK");
-			board.updateTeams();
-		}
-		board.setLine("hiders", ChatColor.BOLD + "" + ChatColor.YELLOW + "HIDERS:" + ChatColor.WHITE + " " + Hider.size());
-		board.setLine("seekers", ChatColor.BOLD + "" + ChatColor.RED + "SEEKERS:" + ChatColor.WHITE + " " + Seeker.size());
-		board.addBlank();
-		if(glowEnabled){
-			if(Main.plugin.game.glow == null || Main.plugin.status == Status.STARTING || !Main.plugin.game.glow.isRunning())
-				board.setLine("glow", "Glow: " + ChatColor.RED + "Inactive");
-			else
-				board.setLine("glow", "Glow: " + ChatColor.GREEN + "Active");
-		}
-		if(tauntEnabled && tauntCountdown){
-			if(Main.plugin.game.taunt == null || Main.plugin.status == Status.STARTING)
-				board.setLine("taunt", "Taunt: " + ChatColor.YELLOW + "0m0s");
-			else if(!tauntLast && Hider.size() == 1){
-				board.setLine("taunt", "Taunt: " + ChatColor.YELLOW + "Expired");
-			} else if(!Main.plugin.game.taunt.isRunning())
-				board.setLine("taunt", "Taunt: " + ChatColor.YELLOW + Main.plugin.game.taunt.getDelay()/60 + "m" + Main.plugin.game.taunt.getDelay()%60 + "s");
-			else
-				board.setLine("taunt", "Taunt: " + ChatColor.YELLOW + "Active");
-		}
-		if(worldborderEnabled){
-			if(Main.plugin.game.worldborder == null || Main.plugin.status == Status.STARTING){
-				board.setLine("board", "WorldBorder: " + ChatColor.YELLOW + "0m0s");
-			} else if(!Main.plugin.game.worldborder.isRunning()) {
-				board.setLine("board", "WorldBorder: " + ChatColor.YELLOW + Main.plugin.game.worldborder.getDelay()/60 + "m" + Main.plugin.game.worldborder.getDelay()%60 + "s");
-			} else {
-				board.setLine("board", "WorldBorder: " + ChatColor.YELLOW + "Decreasing");
-			}
-		}
-		if(glowEnabled || (tauntEnabled && tauntCountdown) || worldborderEnabled)
-			board.addBlank();
-		board.setLine("time", "Time Left: " + ChatColor.GREEN + Main.plugin.game.timeLeft/60 + "m" + Main.plugin.game.timeLeft%60 + "s");
-		board.addBlank();
-		board.setLine("team", "Team: " + getTeam(player));
-		board.display();
-		customBoards.put(player.getName(), board);
-	}
-	
-	public void removeBoard(Player player) {
-		player.setScoreboard(Bukkit.getScoreboardManager().getMainScoreboard());
-		customBoards.remove(player.getName());
-	}
-	
-	public void reloadLobbyBoards() {
-		for(Player player : playerList.values())
-			createLobbyBoard(player, false);
-	}
-	
-	public void reloadGameBoards() {
-		for(Player player : playerList.values())
-			createGameBoard(player, false);
-	}
-
-	public void reloadBoardTeams() {
-		for(CustomBoard board : customBoards.values())
-			board.updateTeams();
-	}
-	
-	private String getSeekerPercent() {
-		if(playerList.values().size() < 2)
-			return " --";
-		else
-			return " "+(int)(100*(1.0/playerList.size()));
-	}
-	
-	private String getHiderPercent() {
-		if(playerList.size() < 2)
-			return " --";
-		else
-			return " "+(int)(100-100*(1.0/playerList.size()));
-	}
-	
-	private String getTeam(Player player) {
-		if(isHider(player)) return ChatColor.GOLD + "HIDER";
-		else if(isSeeker(player)) return ChatColor.RED + "SEEKER";
-		else if(isSpectator(player)) return ChatColor.GRAY + "SPECTATOR";
-		else return ChatColor.WHITE + "UNKNOWN";
-	}
-	
-}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/CommandHandler.java b/src/main/java/net/tylermurphy/hideAndSeek/util/CommandHandler.java
deleted file mode 100644
index e66f7ed..0000000
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/CommandHandler.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package net.tylermurphy.hideAndSeek.util;
-
-import static net.tylermurphy.hideAndSeek.configuration.Config.*;
-import static net.tylermurphy.hideAndSeek.configuration.Localization.*;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import net.tylermurphy.hideAndSeek.command.*;
-
-public class CommandHandler {
-
-	public static Map<String,ICommand> COMMAND_REGISTER = new LinkedHashMap<String,ICommand>();
-	
-	private static void registerCommand(ICommand command) {
-		if(!COMMAND_REGISTER.containsKey(command.getLabel())) {
-			COMMAND_REGISTER.put(command.getLabel().toLowerCase(), command);
-		}
-	}
-	
-	public static void registerCommands() {
-		registerCommand(new About());
-		registerCommand(new Help());
-		registerCommand(new Setup());
-		registerCommand(new Start());
-		registerCommand(new Stop());
-		registerCommand(new SetSpawnLocation());
-		registerCommand(new SetLobbyLocation());
-		registerCommand(new SetExitLocation());
-		registerCommand(new SetBorder());
-		registerCommand(new Reload());
-		registerCommand(new SaveMap());
-		registerCommand(new SetBounds());
-		registerCommand(new Join());
-		registerCommand(new Leave());
-		registerCommand(new Top());
-		registerCommand(new Wins());
-	}
-	
-	public static boolean handleCommand(CommandSender sender, Command cmd, String label, String[] args) {
-		if(!(sender instanceof Player)) {
-			sender.sendMessage(errorPrefix + message("COMMAND_PLAYER_ONLY"));
-		} else if(args.length < 1 || !COMMAND_REGISTER.containsKey(args[0].toLowerCase()) ) {
-			if(permissionsRequired && !sender.hasPermission("hideandseek.about")) {
-				sender.sendMessage(errorPrefix + LOCAL.get(""));
-			} else {
-				COMMAND_REGISTER.get("about").execute(sender, null);
-			}
-		} else {
-			if(!args[0].equalsIgnoreCase("about") && !args[0].equalsIgnoreCase("help") && SaveMap.runningBackup) {
-				sender.sendMessage(errorPrefix + message("MAPSAVE_INPROGRESS"));
-			} else if(permissionsRequired && !sender.hasPermission("hideandseek."+args[0].toLowerCase())) {
-				sender.sendMessage(errorPrefix + message("COMMAND_NOT_ALLOWED"));
-			} else {
-				try {
-					COMMAND_REGISTER.get(args[0].toLowerCase()).execute(sender,Arrays.copyOfRange(args, 1, args.length));
-				} catch (Exception e) {
-					sender.sendMessage(errorPrefix + "An error has occured.");
-					e.printStackTrace();
-				}
-			}
-		}
-		return true;
-	}
-
-}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/CustomBoard.java b/src/main/java/net/tylermurphy/hideAndSeek/util/CustomBoard.java
deleted file mode 100644
index 69d865a..0000000
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/CustomBoard.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package net.tylermurphy.hideAndSeek.util;
-
-import net.tylermurphy.hideAndSeek.Main;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-import org.bukkit.scoreboard.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static net.tylermurphy.hideAndSeek.configuration.Config.*;
-
-public class CustomBoard {
-
-    private final Scoreboard board;
-    private final Objective obj;
-    private final Player player;
-    private final Map<String,Line> LINES;
-    private int blanks;
-    private boolean displayed;
-
-    public CustomBoard(Player player, String title){
-        this.board = Bukkit.getScoreboardManager().getNewScoreboard();
-        this.LINES = new HashMap<String,Line>();
-        this.player = player;
-        this.obj = board.registerNewObjective(
-                "Scoreboard", "dummy", ChatColor.translateAlternateColorCodes('&', title));
-        this.blanks = 0;
-        this.displayed = false;
-        this.updateTeams();
-    }
-
-    public void updateTeams() {
-        try{ board.registerNewTeam("Hider"); } catch (Exception e){}
-        try{ board.registerNewTeam("Seeker"); } catch (Exception e){}
-        Team hiderTeam = board.getTeam("Hider");
-        for(String entry : hiderTeam.getEntries())
-            hiderTeam.removeEntry(entry);
-        for(Player player : Main.plugin.board.getHiders())
-            hiderTeam.addEntry(player.getName());
-        Team seekerTeam = board.getTeam("Seeker");
-        for(String entry : seekerTeam.getEntries())
-            seekerTeam.removeEntry(entry);
-        for(Player player  : Main.plugin.board.getSeekers())
-            seekerTeam.addEntry(player.getName());
-        if(nametagsVisible) {
-            hiderTeam.setOption(Team.Option.NAME_TAG_VISIBILITY, Team.OptionStatus.FOR_OWN_TEAM);
-            seekerTeam.setOption(Team.Option.NAME_TAG_VISIBILITY, Team.OptionStatus.FOR_OTHER_TEAMS);
-        } else {
-            hiderTeam.setOption(Team.Option.NAME_TAG_VISIBILITY, Team.OptionStatus.NEVER);
-            seekerTeam.setOption(Team.Option.NAME_TAG_VISIBILITY, Team.OptionStatus.NEVER);
-        }
-        hiderTeam.setColor(ChatColor.GOLD);
-        seekerTeam.setColor(ChatColor.RED);
-    }
-
-    public void setLine(String key, String message){
-        Line line = LINES.get(key);
-        if(line == null)
-            addLine(key, message);
-        else
-            updateLine(key, message);
-    }
-
-    private void addLine(String key, String message){
-        Score score = obj.getScore(message);
-        score.setScore(LINES.values().size()+1);
-        Line line = new Line(LINES.values().size()+1, message);
-        LINES.put(key, line);
-    }
-
-    public void addBlank(){
-        if(displayed) return;
-        String temp = "";
-        for(int i = 0; i <= blanks; i ++)
-            temp += ChatColor.RESET;
-        blanks++;
-        addLine("blank"+blanks, temp);
-    }
-
-    private void updateLine(String key, String message){
-        Line line = LINES.get(key);
-        board.resetScores(line.getMessage());
-        line.setMessage(message);
-        Score newScore = obj.getScore(message);
-
-        newScore.setScore(line.getScore());
-    }
-
-    public void display() {
-        displayed = true;
-        obj.setDisplaySlot(DisplaySlot.SIDEBAR);
-        player.setScoreboard(board);
-    }
-
-}
-
-class Line {
-
-    private int score;
-    private String message;
-
-    public Line(int score, String message){
-        this.score = score;
-        this.message = message;
-    }
-
-    public int getScore() {
-        return score;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/Packet.java b/src/main/java/net/tylermurphy/hideAndSeek/util/Packet.java
index 564916a..43a358c 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/Packet.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/util/Packet.java
@@ -16,7 +16,7 @@ import com.comphenix.protocol.wrappers.WrappedDataWatcher.Serializer;
 
 public class Packet {
 	
-	private static ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
+	private static final ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
 
 	public static void playSound(Player player, Sound sound, float volume, float pitch) {
 		PacketContainer packet = protocolManager.createPacket(PacketType.Play.Server.NAMED_SOUND_EFFECT);
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/Status.java b/src/main/java/net/tylermurphy/hideAndSeek/util/Status.java
new file mode 100644
index 0000000..76c691f
--- /dev/null
+++ b/src/main/java/net/tylermurphy/hideAndSeek/util/Status.java
@@ -0,0 +1,7 @@
+package net.tylermurphy.hideAndSeek.util;
+
+public enum Status {
+    STANDBY,
+    STARTING,
+    PLAYING
+}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/TabCompleter.java b/src/main/java/net/tylermurphy/hideAndSeek/util/TabCompleter.java
index 667f597..21fe555 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/TabCompleter.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/util/TabCompleter.java
@@ -5,14 +5,14 @@ import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
 
-import org.bukkit.command.Command;
+import net.tylermurphy.hideAndSeek.game.CommandHandler;
 import org.bukkit.command.CommandSender;
 
 public class TabCompleter{
 
-	public static List<String> handleTabComplete(CommandSender sender, Command command, String label, String[] args) {
+	public static List<String> handleTabComplete(CommandSender sender, String[] args) {
 		if(args.length == 1) {
-			return new ArrayList<String>(CommandHandler.COMMAND_REGISTER.keySet())
+			return new ArrayList<>(CommandHandler.COMMAND_REGISTER.keySet())
 					.stream()
 					.filter(handle -> sender.hasPermission("hideandseek."+handle.toLowerCase()) && handle.toLowerCase().startsWith(args[0].toLowerCase(Locale.ROOT)))
 					.collect(Collectors.toList());
@@ -26,7 +26,7 @@ public class TabCompleter{
 					if(parameter.equals("<player>")) {
 						return null;
 					} else {
-						List<String> temp = new ArrayList<String>();
+						List<String> temp = new ArrayList<>();
 						temp.add(parameter.replace("<", "").replace(">", ""));
 						return temp;
 					}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/UUIDFetcher.java b/src/main/java/net/tylermurphy/hideAndSeek/util/UUIDFetcher.java
index 8a5406a..193ec32 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/UUIDFetcher.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/util/UUIDFetcher.java
@@ -41,6 +41,9 @@ public final class UUIDFetcher {
                 uuid.append('-');
             }
         }
+
+        CACHE.put(playername, UUID.fromString(uuid.toString()));
+
         return UUID.fromString(uuid.toString());
     }
 
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/Util.java b/src/main/java/net/tylermurphy/hideAndSeek/util/Util.java
deleted file mode 100644
index 8112f74..0000000
--- a/src/main/java/net/tylermurphy/hideAndSeek/util/Util.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package net.tylermurphy.hideAndSeek.util;
-
-import static net.tylermurphy.hideAndSeek.configuration.Config.*;
-
-import java.io.*;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
-
-import com.google.common.io.ByteStreams;
-import net.md_5.bungee.api.ChatColor;
-import net.tylermurphy.hideAndSeek.configuration.Items;
-import net.tylermurphy.hideAndSeek.configuration.LocalizationString;
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.Player;
-
-import net.tylermurphy.hideAndSeek.Main;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.inventory.meta.PotionMeta;
-import org.bukkit.potion.PotionData;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-import org.bukkit.potion.PotionType;
-
-public class Util {
-    
-    public static void broadcastMessage(String message) {
-    	for(Player player : Main.plugin.board.getPlayers()) {
-    		player.sendMessage(message);
-    	}
-    }
-    
-    public static boolean isSetup() {
-    	if(spawnPosition.getBlockX() == 0 && spawnPosition.getBlockY() == 0 && spawnPosition.getBlockZ() == 0) return false;
-		if(lobbyPosition.getBlockX() == 0 && lobbyPosition.getBlockY() == 0 && lobbyPosition.getBlockZ() == 0) return false;
-		if(exitPosition.getBlockX() == 0 && exitPosition.getBlockY() == 0 && exitPosition.getBlockZ() == 0) return false;
-		File destenation = new File(Main.root+File.separator+"hideandseek_"+spawnWorld);
-		if(!destenation.exists()) return false;
-		if(saveMinX == 0 || saveMinZ == 0 || saveMaxX == 0 || saveMaxZ == 0) return false;
-		return true;
-    }
-    
-    public static void sendDelayedMessage(String message, int gameId, int delay) {
-		Bukkit.getScheduler().runTaskLaterAsynchronously(Main.plugin, new Runnable() {
-			public void run() {
-				if(gameId == Main.plugin.game.gameId)
-					Util.broadcastMessage(message);
-			}
-		}, delay);
-	}
-
-	public static void resetPlayer(Player player) {
-		player.getInventory().clear();
-		for (PotionEffect effect : player.getActivePotionEffects()) {
-			player.removePotionEffect(effect.getType());
-		}
-		if (Main.plugin.board.isSeeker(player)) {
-			if(pvpEnabled)
-				for(ItemStack item : Items.SEEKER_ITEMS)
-					player.getInventory().addItem(item);
-			for(PotionEffect effect : Items.SEEKER_EFFECTS)
-				player.addPotionEffect(effect);
-		} else if (Main.plugin.board.isHider(player)) {
-			if(pvpEnabled)
-				for(ItemStack item : Items.HIDER_ITEMS)
-					player.getInventory().addItem(item);
-			for(PotionEffect effect : Items.HIDER_EFFECTS)
-				player.addPotionEffect(effect);
-			if(glowEnabled) {
-				ItemStack snowball = new ItemStack(Material.SNOWBALL, 1);
-				ItemMeta snowballMeta = snowball.getItemMeta();
-				snowballMeta.setDisplayName("Glow Powerup");
-				List<String> snowballLore = new ArrayList<String>();
-				snowballLore.add("Throw to make all seekers glow");
-				snowballLore.add("Last 30s, all hiders can see it");
-				snowballLore.add("Time stacks on multi use");
-				snowballMeta.setLore(snowballLore);
-				snowball.setItemMeta(snowballMeta);
-				player.getInventory().addItem(snowball);
-			}
-		}
-	}
-
-	public static void removeItems(Player player){
-		for(ItemStack si : Items.SEEKER_ITEMS)
-			for(ItemStack i : player.getInventory().getContents())
-				if(si.isSimilar(i)) player.getInventory().remove(i);
-		for(ItemStack hi : Items.HIDER_ITEMS)
-			for(ItemStack i : player.getInventory().getContents())
-				if(hi.isSimilar(i)) player.getInventory().remove(i);
-	}
-
-	public static InputStream convertUniqueId(UUID uuid) {
-		byte[] bytes = new byte[16];
-		ByteBuffer.wrap(bytes)
-				.putLong(uuid.getMostSignificantBits())
-				.putLong(uuid.getLeastSignificantBits());
-		return new ByteArrayInputStream(bytes);
-	}
-
-	public static UUID convertBinaryStream(InputStream stream) {
-		ByteBuffer buffer = ByteBuffer.allocate(16);
-		try {
-			buffer.put(ByteStreams.toByteArray(stream));
-			buffer.flip();
-			return new UUID(buffer.getLong(), buffer.getLong());
-		} catch (IOException e) {}
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/util/WinType.java b/src/main/java/net/tylermurphy/hideAndSeek/util/WinType.java
new file mode 100644
index 0000000..1a1eb74
--- /dev/null
+++ b/src/main/java/net/tylermurphy/hideAndSeek/util/WinType.java
@@ -0,0 +1,7 @@
+package net.tylermurphy.hideAndSeek.util;
+
+public enum WinType {
+    HIDER_WIN,
+    SEEKER_WIN,
+    NONE
+}