2 files changed, 37 insertions, 26 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/events/Glow.java b/src/main/java/net/tylermurphy/hideAndSeek/events/Glow.java
index dec3b0f..6ea5ab8 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/events/Glow.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/events/Glow.java
@@ -6,6 +6,8 @@ import org.bukkit.entity.Player;
 import net.tylermurphy.hideAndSeek.Main;
 import net.tylermurphy.hideAndSeek.util.Packet;
 
+import static net.tylermurphy.hideAndSeek.configuration.Config.*;
+
 public class Glow {
 
 	private final int temp;
@@ -18,7 +20,8 @@ public class Glow {
 	}
 	
 	public void onProjectilve() {
-		glowTime++;
+		if(glowStackable) glowTime += glowLength;
+		else glowTime = glowLength;
 		if(!running)
 			startGlow();
 	}
@@ -45,15 +48,20 @@ public class Glow {
 					waitGlow();
 				}
 			}
-		}, 20*30);
+		}, 20);
 	}
 	
 	private void stopGlow() {
+		running = false;
 		for(Player hider : Main.plugin.board.getHiders()) {
-			for(Player seeker : Main.plugin.board.getSeekers()) {
+			for (Player seeker : Main.plugin.board.getSeekers()) {
 				Packet.setGlow(hider, seeker, false);
 			}
 		}
 	}
+
+	public boolean isRunning() {
+		return running;
+	}
 	
 }
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java b/src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java
index 8413cc2..748ae40 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java
@@ -18,38 +18,31 @@ public class Taunt {
 
 	private final int temp;
 	private String tauntPlayer;
+	private int delay;
+	private boolean running;
 	
 	public Taunt(int temp) {
 		this.temp = temp;
+		this.delay = 0;
 	}
 	
 	public void schedule() {
-		Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Main.plugin, new Runnable() {
-			public void run() {
-				tryTaunt();
-			}
-		},20*60*5);
+		delay = tauntDelay;
+		waitTaunt();
 	}
-	
+
 	private void waitTaunt() {
 		Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Main.plugin, new Runnable() {
 			public void run() {
-				tryTaunt();
-			}
-		},20*60);
-	}
-	
-	private void tryTaunt() {
-		if(temp != Main.plugin.gameId) return;
-		if(Math.random() > .8) {
-			executeTaunt();
-		} else {
-			Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Main.plugin, new Runnable() {
-				public void run() {
-					tryTaunt();
+				if(delay == 0) {
+					if(!tauntLast && Main.plugin.board.size() < 2) return;
+					else executeTaunt();
+				} else {
+					delay--;
+					waitTaunt();
 				}
-			},20*60);
-		}
+			}
+		},20);
 	}
 	
 	private void executeTaunt() {
@@ -65,6 +58,7 @@ public class Taunt {
 			}
 		}
 		if(taunted != null) {
+			running = true;
 			taunted.sendMessage(message("TAUNTED").toString());
 			Util.broadcastMessage(tauntPrefix + message("TAUNT"));
 			tauntPlayer = taunted.getName();
@@ -90,12 +84,21 @@ public class Taunt {
 				        Util.broadcastMessage(tauntPrefix + message("TAUNT_ACTIVATE"));
 					}
 					tauntPlayer = "";
-					waitTaunt();
+					running = false;
+					schedule();
 				}
 			},20*30);
 		} else {
-			waitTaunt();
+			schedule();
 		}
 	}
+
+	public int getDelay(){
+		return delay;
+	}
+
+	public boolean isRunning() {
+		return running;
+	}
 	
 }