fix: 修复资源刷新 Runnable 重复运行 [1]

chore(optimize): 优化部分代码结构
fix(chore): 修复代码静态混用问题

[1] https://www.spigotmc.org/threads/illegalstateexception-on-bukkitrunnable.197896/#post-2060708

Author: FoliageOwO

src/main/java/top/mpt/xzystudio/flywars/Main.java

@@ -5,7 +5,6 @@
 import top.mpt.xzystudio.flywars.executor.CommandHandler;
 import top.mpt.xzystudio.flywars.listeners.GameEventListener;
 import top.mpt.xzystudio.flywars.listeners.PlayerEventListener;
-import top.mpt.xzystudio.flywars.scheduler.ResourcesUpdate;
 import top.mpt.xzystudio.flywars.utils.ChatUtils;
 
 import java.util.Objects;

src/main/java/top/mpt/xzystudio/flywars/game/Game.java

@@ -5,7 +5,6 @@
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.PlayerInventory;
-import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scoreboard.Team;
 import top.mpt.xzystudio.flywars.Main;
@@ -35,7 +34,7 @@ public class Game {
     /**
      * 资源刷新
      */
-    public static ResourcesUpdate resUpdater;
+    public static ResourcesUpdate resUpdater = null;
 
     private final CommandSender sender;
 
@@ -130,13 +129,7 @@ public void run() {
                 // 资源刷新点
                 resUpdater = new ResourcesUpdate();
                 resUpdater.setGameWorld(pl.getWorld());
-                try {
-//                    if (!resUpdater.isCancelled()) resUpdater.cancel(); // 这样写没用，还是会报错，干脆不用它了，用trycatch
-                    resUpdater.runTaskTimer(Main.instance, 0, Long.parseLong(ConfigUtils.getConfig("refresh-tick", 600).toString()));
-                } catch (Exception e){
-                    Main.instance.getLogger().warning(ChatUtils.translateColor("#RED#奇奇怪怪的BUG出现了，不过应该问题不大"));
-                    ChatUtils.broadcast(ChatUtils.translateColor("[FlyWars] #GOLD#BugWars: #RED#创建资源刷新点任务失败，可能是已存在！"));
-                }
+                resUpdater.runTaskTimer(Main.instance, 0, Long.parseLong(ConfigUtils.getConfig("refresh-tick", 600).toString()));
                 // 计分板
                 teams.forEach(scoreboardManager::newBoard);
                 scoreboardManager.renderScoreboard();

src/main/java/top/mpt/xzystudio/flywars/listeners/GameEventListener.java

@@ -9,7 +9,6 @@
 import top.mpt.xzystudio.flywars.events.GameOverEvent;
 import top.mpt.xzystudio.flywars.events.TeamEliminatedEvent;
 import top.mpt.xzystudio.flywars.game.Game;
-import top.mpt.xzystudio.flywars.game.scoreboard.ScoreboardManager;
 import top.mpt.xzystudio.flywars.game.team.GameTeam;
 import top.mpt.xzystudio.flywars.game.team.TeamInfo;
 import top.mpt.xzystudio.flywars.utils.ChatUtils;
@@ -27,7 +26,6 @@
  * 游戏相关事件监听器
  */
 public class GameEventListener implements Listener {
-
     @EventHandler
     public void onTeamEliminated(TeamEliminatedEvent event) {
         Player p = event.getPlayer();
@@ -75,11 +73,11 @@ public void onGameOver(GameOverEvent event) {
         // 重置计分板
         Game.scoreboardManager.reset();
         // 取消资源刷新
-        Game.resUpdater.cancel();
-        // 遍历teams数组，把每个team注销
-        Game.teams.forEach(GameTeam::unregTeam);
+        if (Game.resUpdater != null) Game.resUpdater.cancel();
         // 遍历teams数组
         Game.teams.forEach(team -> {
+            // 把每个team注销
+            team.unregTeam();
             // 获取团队信息
             TeamInfo info = Game.scoreboardManager.getInfo(team);
             // 获取每个玩家

src/main/java/top/mpt/xzystudio/flywars/scheduler/ResourcesUpdate.java

@@ -5,11 +5,12 @@
 import org.bukkit.World;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitRunnable;
-import top.mpt.xzystudio.flywars.Main;
 import top.mpt.xzystudio.flywars.utils.ConfigUtils;
 import top.mpt.xzystudio.flywars.utils.ItemUtils;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 刷新资源类
@@ -49,7 +50,6 @@ public void run() {
                 int y = (Integer) its.get("y");
                 int z = (Integer) its.get("z");
                 int amount = (Integer) its.get("amount");
-//                Main.instance.getLogger().info(String.format("(%d, %d, %d)", x, y, z));
 
                 Location loc = new Location(gameWorld, x, y, z);
                 ItemStack itemStack = ItemUtils.newItem(value, displayName.getOrDefault(key, key), amount);