lobby bug fixes, titles, game time

1 files changed, 28 insertions, 18 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/Tick.java b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/Tick.java
index eccaf39..7224210 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/Tick.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/Tick.java
@@ -2,9 +2,7 @@ package net.tylermurphy.hideAndSeek.bukkit;
 
 import static net.tylermurphy.hideAndSeek.Store.*;
 
-
 import org.bukkit.Bukkit;
-import org.bukkit.Location;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 
@@ -22,34 +20,31 @@ public class Tick {
 			Functions.loadScoreboard();
 		}
 		
-		if(status.equals("Starting")) {
-			onStarting();
-		} else if(status.equals("Playing")) {
+		if(status.equals("Standby")) {
+			tick = 0;
+		}
+		 
+		if(status.equals("Playing")) {
 			onPlaying();
 		}
 		
-		tick ++;
-		
 		if(( status.equals("Starting") || status.equals("Playing") ) && Hider.size() < 1) {
-			Bukkit.broadcastMessage(gameoverPrefix + "All hiders have been found.");
+			if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(gameoverPrefix + "All hiders have been found.");
+			else Functions.broadcastMessage(gameoverPrefix + "All hiders have been found.");
 			Stop.onStop();
 		}
 		if(( status.equals("Starting") || status.equals("Playing") ) && Seeker.size() < 1) {
-			Bukkit.broadcastMessage(abortPrefix + "All seekers have quit.");
+			if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(abortPrefix + "All seekers have quit.");
+			else Functions.broadcastMessage(abortPrefix + "All seekers have quit.");
 			Stop.onStop();
 		}
-	}
-	
-	private static void onStarting() {
-		for(String playerName : Seeker) {
-			Player player = playerList.get(playerName);
-			if(player != null) {
-				player.teleport(new Location(Bukkit.getWorld("hideandseek_"+spawnWorld), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ()));
-			}
-		}
+		
 	}
 	
 	private static void onPlaying() {
+		
+		tick ++;
+		
 		for(String playerName : Hider) {
 			Player player = playerList.get(playerName);
 			int distance = 100;
@@ -76,6 +71,21 @@ public class Tick {
 					if(distance < 20) Packet.playSound(player, Sound.BLOCK_NOTE_BLOCK_BIT, .3f, 1f);
 					break;
 			}
+			
+		}
+		
+		if(tick%20 == 0) {
+			if(gameLength > 0) {
+				timeLeft--;
+				for(Player player : playerList.values()) {
+					player.setLevel(timeLeft);
+				}
+				if(timeLeft < 1) {
+					if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(gameoverPrefix + "Seekers ran out of time. Hiders win!");
+					else Functions.broadcastMessage(gameoverPrefix + "Seekers ran out of time. Hiders win!");
+					Stop.onStop();
+				}
+			}
 		}
 	}
 }
\ No newline at end of file