teams reference rewrite

1 files changed, 19 insertions, 4 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java b/src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java
index 04bddfb..70c4986 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/events/Worldborder.java
@@ -5,9 +5,9 @@ import org.bukkit.World;
 import org.bukkit.WorldBorder;
 
 import net.tylermurphy.hideAndSeek.Main;
-import net.tylermurphy.hideAndSeek.util.Functions;
+import net.tylermurphy.hideAndSeek.util.Util;
 
-import static net.tylermurphy.hideAndSeek.Store.*;
+import static net.tylermurphy.hideAndSeek.Config.*;
 
 public class Worldborder {
 
@@ -26,9 +26,9 @@ public class Worldborder {
 	}
 	
 	private void decreaceWorldborder() {
-		if(temp != gameId) return;
+		if(temp != Main.plugin.gameId) return;
 		if(currentWorldborderSize-100 > 100) {
-			Functions.broadcastMessage(worldborderPrefix + "Worldborder decreacing by 100 blocks over the next 30s");
+			Util.broadcastMessage(worldborderPrefix + "Worldborder decreacing by 100 blocks over the next 30s");
 			currentWorldborderSize -= 100;
 			World world = Bukkit.getWorld("hideandseek_"+spawnWorld);
 			WorldBorder border = world.getWorldBorder();
@@ -41,4 +41,19 @@ public class Worldborder {
 		}
 	}
 	
+	public static void resetWorldborder(String worldName) {
+		if(worldborderEnabled) {
+			World world = Bukkit.getWorld(worldName);
+			WorldBorder border = world.getWorldBorder();
+			border.setSize(worldborderSize);
+			border.setCenter(worldborderPosition.getX(), worldborderPosition.getZ());
+			currentWorldborderSize = worldborderSize;
+		} else {
+			World world = Bukkit.getWorld(worldName);
+			WorldBorder border = world.getWorldBorder();
+			border.setSize(30000000);
+			border.setCenter(0, 0);
+		}
+	}
+	
 }