Fix bug with world border disappearing

KaiNakamura · Dec 10, 2022 · 05cabdc · 05cabdc
1 parent a584fb7
commit 05cabdc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 36 deletions.
diff --git a/src/main/java/com/github/speedrunshowdown/SpeedrunShowdown.java b/src/main/java/com/github/speedrunshowdown/SpeedrunShowdown.java
@@ -55,7 +55,6 @@
 import com.github.speedrunshowdown.listeners.GUIClickListener;
 import com.github.speedrunshowdown.listeners.PlayerChangedWorldListener;
 import com.github.speedrunshowdown.listeners.PlayerDeathListener;
-import com.github.speedrunshowdown.listeners.PlayerLoginListener;
 import com.github.speedrunshowdown.listeners.PlayerRespawnListener;
 import com.github.speedrunshowdown.listeners.PortalEnterListener;
 import com.github.speedrunshowdown.listeners.RespawnAnchorUseListener;
@@ -100,7 +99,6 @@ public void onEnable() {
         getServer().getPluginManager().registerEvents(new GUIClickListener(), this);
         getServer().getPluginManager().registerEvents(new PlayerChangedWorldListener(), this);
         getServer().getPluginManager().registerEvents(new PlayerDeathListener(), this);
-        getServer().getPluginManager().registerEvents(new PlayerLoginListener(), this);
         getServer().getPluginManager().registerEvents(new PlayerRespawnListener(), this);
         getServer().getPluginManager().registerEvents(new PortalEnterListener(), this);
         getServer().getPluginManager().registerEvents(new RespawnAnchorUseListener(), this);
@@ -155,9 +153,6 @@ public void run() {
         // Update scoreboard
         scoreboardManager.update();
 
-        // Update world border
-        worldBorderManager.update();
-
         // Do sudden death things
         if (suddenDeath) {
             World end = getServer().getWorld("world_the_end");

diff --git a/src/main/java/com/github/speedrunshowdown/border/WorldBorderManager.java b/src/main/java/com/github/speedrunshowdown/border/WorldBorderManager.java
@@ -5,13 +5,12 @@
 
 import com.github.speedrunshowdown.SpeedrunShowdown;
 
-public class WorldBorderManager {
+public class WorldBorderManager implements Runnable {
     private static final int PREGAME_BORDER_SIZE = 32; // blocks
     private static final int OVERWORLD_BORDER_SIZE = 6000; // blocks
     private static final int NETHER_BORDER_SIZE = OVERWORLD_BORDER_SIZE / 8; // blocks
     private static final int END_BORDER_SIZE = 1000; // blocks
 
-    private boolean enabled = false;
     private SpeedrunShowdown plugin;
     private WorldBorder overworldBorder, netherBorder, endBorder;
 
@@ -31,36 +30,28 @@ public WorldBorderManager() {
         // Move border to spawn location
         overworldBorder.setCenter(plugin.getServer().getWorld("world").getSpawnLocation());
 
-        update();
-        updateWorldBorderForAllPlayers();
+        // Schedule repeating task
+        plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, this, 20, 20);
     }
 
     public void init() {
         // Change overworld border to default size
         overworldBorder.setSize(OVERWORLD_BORDER_SIZE);
         overworldBorder.setCenter(0, 0);
 
-        update();
-        updateWorldBorderForAllPlayers();
+        // Run once to update immediately
+        run();
     }
 
-    public void update() {
-        // If config file changes, update world border for all players
-        boolean newEnabled = plugin.getConfig().getBoolean("world-border");
-        if (enabled != newEnabled) {
-            enabled = newEnabled;
-            updateWorldBorderForAllPlayers();
-        }
-    }
-
-    public void updateWorldBorderForAllPlayers() {
+    @Override
+    public void run() {
         for (Player player : plugin.getServer().getOnlinePlayers()) {
             updatePlayerWorldBorder(player);
         }
     }
 
     public void updatePlayerWorldBorder(Player player) {
-        if (enabled) {
+        if (plugin.getConfig().getBoolean("world-border")) {
             // Switch the player's world border depending on the world they are in
             switch (player.getWorld().getEnvironment()) {
                 case NORMAL:

diff --git a/src/main/java/com/github/speedrunshowdown/listeners/PlayerLoginListener.java b/src/main/java/com/github/speedrunshowdown/listeners/PlayerLoginListener.java