1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/events/Border.java b/src/main/java/net/tylermurphy/hideAndSeek/game/events/Border.java
index 9fb7e13..f7ab581 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/events/Border.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/events/Border.java
@@ -41,13 +41,14 @@ public class Border {
         running = true;
         Main.getInstance().getGame().broadcastMessage(worldBorderPrefix + message("WORLDBORDER_DECREASING").addAmount(change));
         currentSize -= map.getWorldBorderData().getZ();
-        org.bukkit.WorldBorder border = map.getSpawn().getWorld().getWorldBorder();
+        org.bukkit.WorldBorder border = map.getGameSpawn().getWorld().getWorldBorder();
         border.setSize(border.getSize()-change,30);
         delay = 30;
     }
 
     public void resetWorldBorder() {
-        org.bukkit.WorldBorder border = map.getSpawn().getWorld().getWorldBorder();
+        if(map.getGameSpawn().getWorld() == null) return;
+        org.bukkit.WorldBorder border = map.getGameSpawn().getWorld().getWorldBorder();
         if (map.isWorldBorderEnabled()) {
             border.setSize(map.getWorldBorderData().getX());
             border.setCenter(map.getWorldBorderPos().getX(), map.getWorldBorderPos().getY());