4 files changed, 8 insertions, 93 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/Tick.java b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/Tick.java
deleted file mode 100644
index 8efbe80..0000000
--- a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/Tick.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package net.tylermurphy.hideAndSeek.bukkit;
-
-import static net.tylermurphy.hideAndSeek.configuration.Config.*;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Sound;
-import org.bukkit.entity.Player;
-
-import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.command.Stop;
-import net.tylermurphy.hideAndSeek.util.Packet;
-import net.tylermurphy.hideAndSeek.util.Util;
-import static net.tylermurphy.hideAndSeek.configuration.Localization.*;
-
-public class Tick {
-
-	static int tick = 0;
-	
-	public static void onTick() {
-		
-		if(Main.plugin.status.equals("Standby")) tick = 0;
-		else if(Main.plugin.status.equals("Playing")) onPlaying();
-		
-		if(( Main.plugin.status.equals("Starting") || Main.plugin.status.equals("Playing") ) && Main.plugin.board.sizeHider() < 1) {
-			if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_HIDERS_FOUND"));
-			else Util.broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_HIDERS_FOUND"));
-			Stop.onStop();
-		}
-		if(( Main.plugin.status.equals("Starting") || Main.plugin.status.equals("Playing") ) && Main.plugin.board.sizeSeeker() < 1) {
-			if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(abortPrefix + message("GAME_GAMEOVER_SEEKERS_QUIT"));
-			else Util.broadcastMessage(abortPrefix + message("GAME_GAMEOVER_SEEKERS_QUIT"));
-			Stop.onStop();
-		}
-		
-	}
-	
-	private static void onPlaying() {
-		
-		if(tick<1000000) tick++;
-		else tick = 1;
-		
-		for(Player hider : Main.plugin.board.getHiders()) {
-			int distance = 100, temp = 100;
-			for(Player seeker : Main.plugin.board.getSeekers()) {
-				try {
-					temp = (int) hider.getLocation().distance(seeker.getLocation());
-				} catch (Exception e){
-					//Players in different worlds, NOT OK!!!
-				}
-				if(distance > temp) {
-					distance = temp;
-				}
-			}
-			switch(tick%10) {
-				case 0:
-					if(distance < 30) Packet.playSound(hider, Sound.BLOCK_NOTE_BLOCK_BASEDRUM, .5f, 1f);
-					if(distance < 10) Packet.playSound(hider, Sound.BLOCK_NOTE_BLOCK_BIT, .3f, 1f);
-					break;
-				case 3:
-					if(distance < 30) Packet.playSound(hider, Sound.BLOCK_NOTE_BLOCK_BASEDRUM, .3f, 1f);
-					if(distance < 10) Packet.playSound(hider, Sound.BLOCK_NOTE_BLOCK_BIT, .3f, 1f);
-					break;
-				case 6:
-					if(distance < 10) Packet.playSound(hider, Sound.BLOCK_NOTE_BLOCK_BIT, .3f, 1f);
-					break;
-				case 9:
-					if(distance < 20) Packet.playSound(hider, Sound.BLOCK_NOTE_BLOCK_BIT, .3f, 1f);
-					break;
-			}
-			
-		}
-		
-		if(tick%20 == 0) {
-			if(gameLength > 0) {
-				Main.plugin.board.reloadGameBoards();
-				Main.plugin.timeLeft--;
-				if(Main.plugin.timeLeft < 1) {
-					if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_TIME"));
-					else Util.broadcastMessage(gameoverPrefix + message("GAME_GAMEOVER_TIME"));
-					Stop.onStop();
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java b/src/main/java/net/tylermurphy/hideAndSeek/game/EventListener.java
index ffad241..d7bb89b 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/EventListener.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.bukkit;
+package net.tylermurphy.hideAndSeek.game;
 
 import static net.tylermurphy.hideAndSeek.configuration.Config.*;
 
@@ -57,7 +57,7 @@ public class EventListener implements Listener {
 	@EventHandler
 	public void onQuit(PlayerQuitEvent event) {
 		Main.plugin.board.remove(event.getPlayer());
-		if(Main.plugin.status.equals("Standby")) {
+		if(Main.plugin.status == Status.STANDBY) {
 			Main.plugin.board.reloadLobbyBoards();
 		} else {
 			Main.plugin.board.reloadGameBoards();
@@ -70,7 +70,7 @@ public class EventListener implements Listener {
 	@EventHandler
 	public void onKick(PlayerKickEvent event) {
 		Main.plugin.board.remove(event.getPlayer());
-		if(Main.plugin.status.equals("Standby")) {
+		if(Main.plugin.status == Status.STANDBY) {
 			Main.plugin.board.reloadLobbyBoards();
 		} else {
 			Main.plugin.board.reloadGameBoards();
@@ -86,7 +86,7 @@ public class EventListener implements Listener {
 			if (event.getEntity() instanceof Player) {
 				Player p = (Player) event.getEntity();
 				if (!Main.plugin.board.isPlayer(p)) return;
-				if (!Main.plugin.status.equals("Playing")) {
+				if (Main.plugin.status != Status.PLAYING) {
 					event.setCancelled(true);
 					return;
 				}
@@ -128,14 +128,14 @@ public class EventListener implements Listener {
 	
 	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onProjectile(ProjectileLaunchEvent event) {
-		if(!Main.plugin.status.equals("Playing")) return;
+		if(Main.plugin.status != Status.PLAYING) return;
 		if(event.getEntity() instanceof Snowball) {
 			if(!glowEnabled) return;
 			Snowball snowball = (Snowball) event.getEntity();
 			if(snowball.getShooter() instanceof Player) {
 				Player player = (Player) snowball.getShooter();
 				if(Main.plugin.board.isHider(player)) {
-					Main.plugin.glow.onProjectilve();
+					Main.plugin.game.glow.onProjectile();
 					snowball.remove();
 					player.getInventory().remove(Material.SNOWBALL);
 				}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/CommandHandler.java b/src/main/java/net/tylermurphy/hideAndSeek/util/CommandHandler.java
index 1efb505..56084dd 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/CommandHandler.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/util/CommandHandler.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.bukkit;
+package net.tylermurphy.hideAndSeek.util;
 
 import static net.tylermurphy.hideAndSeek.configuration.Config.*;
 import static net.tylermurphy.hideAndSeek.configuration.Localization.*;
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/TabCompleter.java b/src/main/java/net/tylermurphy/hideAndSeek/util/TabCompleter.java
index 2f7dbd4..667f597 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/TabCompleter.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/util/TabCompleter.java
@@ -1,4 +1,4 @@
-package net.tylermurphy.hideAndSeek.bukkit;
+package net.tylermurphy.hideAndSeek.util;
 
 import java.util.ArrayList;
 import java.util.List;