From 0787c6ab5851c9e2ce613b92ebb6314098072bcc Mon Sep 17 00:00:00 2001
From: gingmzmzx <2417481092@qq.com>
Date: Sun, 8 Jan 2023 18:13:23 +0800
Subject: [PATCH] =?UTF-8?q?:tada:=20=E6=89=80=E6=9C=89=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/top/mpt/xzystudio/flywars/game/Game.java     | 7 ++++---
 .../mpt/xzystudio/flywars/listeners/GameEventListener.java | 2 +-
 .../xzystudio/flywars/listeners/PlayerEventListener.java   | 2 +-
 .../mpt/xzystudio/flywars/scheduler/ResourcesUpdate.java   | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/top/mpt/xzystudio/flywars/game/Game.java b/src/main/java/top/mpt/xzystudio/flywars/game/Game.java
index cf31322..935fd11 100644
--- a/src/main/java/top/mpt/xzystudio/flywars/game/Game.java
+++ b/src/main/java/top/mpt/xzystudio/flywars/game/Game.java
@@ -130,11 +130,12 @@ public void run() {
                 // 资源刷新点
                 resUpdater.setGameWorld(pl.getWorld());
                 try {
-                    if (!resUpdater.isCancelled()) resUpdater.cancel();
-                } catch (IllegalStateException e){
+//                    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();
diff --git a/src/main/java/top/mpt/xzystudio/flywars/listeners/GameEventListener.java b/src/main/java/top/mpt/xzystudio/flywars/listeners/GameEventListener.java
index cb9aa55..1850538 100644
--- a/src/main/java/top/mpt/xzystudio/flywars/listeners/GameEventListener.java
+++ b/src/main/java/top/mpt/xzystudio/flywars/listeners/GameEventListener.java
@@ -52,7 +52,7 @@ public void onTeamEliminated(TeamEliminatedEvent event) {
         AtomicInteger ifGameOver = new AtomicInteger();
         AtomicReference<GameTeam> aliveTeam = null;
         Game.teams.forEach(it -> {
-            if (ScoreboardManager.info.get(it).getAlive()){
+            if (Game.scoreboardManager.info.get(it).getAlive()){
                 ifGameOver.getAndIncrement();
                 aliveTeam.set(it);
             }
diff --git a/src/main/java/top/mpt/xzystudio/flywars/listeners/PlayerEventListener.java b/src/main/java/top/mpt/xzystudio/flywars/listeners/PlayerEventListener.java
index f09b59e..b9a2acb 100644
--- a/src/main/java/top/mpt/xzystudio/flywars/listeners/PlayerEventListener.java
+++ b/src/main/java/top/mpt/xzystudio/flywars/listeners/PlayerEventListener.java
@@ -116,7 +116,7 @@ public void onEntityDismount(EntityDismountEvent event) {
                         passenger.eject();
                         vehicle.addPassenger(passenger);
                     } catch (Exception e) {
-                        Main.instance.getLogger().warning(ChatUtils.translateColor("#RED#又是奇奇怪怪的bug，罢了罢了"));
+//                        Main.instance.getLogger().warning(ChatUtils.translateColor("#RED#又是奇奇怪怪的bug，罢了罢了"));
                     }
                 }
             });
diff --git a/src/main/java/top/mpt/xzystudio/flywars/scheduler/ResourcesUpdate.java b/src/main/java/top/mpt/xzystudio/flywars/scheduler/ResourcesUpdate.java
index 5528b9d..7ba9b95 100644
--- a/src/main/java/top/mpt/xzystudio/flywars/scheduler/ResourcesUpdate.java
+++ b/src/main/java/top/mpt/xzystudio/flywars/scheduler/ResourcesUpdate.java
@@ -49,7 +49,7 @@ 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));
+//                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);