finished lobby and manual join system

2 files changed, 5 insertions, 3 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java b/src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java
index f2f09a1..0890832 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/events/Taunt.java
@@ -12,6 +12,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.meta.FireworkMeta;
 
 import net.tylermurphy.hideAndSeek.Main;
+import net.tylermurphy.hideAndSeek.util.Functions;
 
 public class Taunt {
 
@@ -65,7 +66,7 @@ public class Taunt {
 		}
 		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");
+			Functions.broadcastMessage(tauntPrefix + " A random hider will be taunted in the next 30s");
 			tauntPlayer = taunted.getName();
 			Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(Main.plugin, new Runnable() {
 				public void run() {
@@ -86,7 +87,7 @@ public class Taunt {
 				        		.withTrail()
 				        		.build());
 				        fw.setFireworkMeta(fwm);
-				        Bukkit.getServer().broadcastMessage(tauntPrefix + " Taunt has been activated");
+				        Functions.broadcastMessage(tauntPrefix + " Taunt has been activated");
 					}
 					tauntPlayer = "";
 					waitTaunt();
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java b/src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java
index 5e64381..04bddfb 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java
@@ -5,6 +5,7 @@ import org.bukkit.World;
 import org.bukkit.WorldBorder;
 
 import net.tylermurphy.hideAndSeek.Main;
+import net.tylermurphy.hideAndSeek.util.Functions;
 
 import static net.tylermurphy.hideAndSeek.Store.*;
 
@@ -27,7 +28,7 @@ public class Worldborder {
 	private void decreaceWorldborder() {
 		if(temp != gameId) return;
 		if(currentWorldborderSize-100 > 100) {
-			Bukkit.getServer().broadcastMessage(worldborderPrefix + "Worldborder decreacing by 100 blocks over the next 30s");
+			Functions.broadcastMessage(worldborderPrefix + "Worldborder decreacing by 100 blocks over the next 30s");
 			currentWorldborderSize -= 100;
 			World world = Bukkit.getWorld("hideandseek_"+spawnWorld);
 			WorldBorder border = world.getWorldBorder();