:bugs: BugWars :(

Author: Gingmzmzx

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

@@ -127,6 +127,14 @@ public void startGame() {
             // 在run方法中不要创建计分板，要不然后期`GameTeam.getBoard()`获取不到（（（
             @Override
             public void run() {
+                // 资源刷新点
+                resUpdater.setGameWorld(pl.getWorld());
+                try {
+                    if (!resUpdater.isCancelled()) resUpdater.cancel();
+                } catch (IllegalStateException e){
+                    Main.instance.getLogger().warning(ChatUtils.translateColor("#RED#奇奇怪怪的BUG出现了，不过应该问题不大"));
+                }
+                resUpdater.runTaskTimer(Main.instance, 0, Long.parseLong(ConfigUtils.getConfig("refresh-tick", 600).toString()));
                 // 计分板
                 teams.forEach(scoreboardManager::newBoard);
                 scoreboardManager.renderScoreboard();
@@ -164,10 +172,6 @@ public void run() {
                         }
                     }
                 }
-
-                resUpdater.setGameWorld(pl.getWorld());
-                resUpdater.cancel();
-                resUpdater.runTaskTimer(Main.instance, 0, Long.parseLong(ConfigUtils.getConfig("refresh-tick", 600).toString()));
             }
         }.runTaskLater(Main.instance, (Integer) ConfigUtils.getConfig("delay-tick", 200));
         // runTaskLater 延迟♂执行

src/main/java/top/mpt/xzystudio/flywars/game/team/GameTeam.java

@@ -100,9 +100,10 @@ public String getTeamDisplayName() {
      * 让p2骑在p1头上
      */
     public void ride(){
-        while (!p1.addPassenger(p2)){
+        if (!p1.addPassenger(p2)){
             p2.eject();
             p1.eject();
+            p1.addPassenger(p2); // 不使用循环，否则一直报错
         }
     }
 

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

@@ -5,6 +5,7 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import top.mpt.xzystudio.flywars.Main;
 import top.mpt.xzystudio.flywars.events.GameOverEvent;
 import top.mpt.xzystudio.flywars.events.TeamEliminatedEvent;
 import top.mpt.xzystudio.flywars.game.Game;
@@ -19,6 +20,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 /**
@@ -48,11 +50,20 @@ public void onTeamEliminated(TeamEliminatedEvent event) {
 
         // 判断是不是只剩最后一个队伍（胜利）
         AtomicInteger ifGameOver = new AtomicInteger();
+        AtomicReference<GameTeam> aliveTeam = null;
         Game.teams.forEach(it -> {
-            if (ScoreboardManager.info.get(it).getAlive()) ifGameOver.getAndIncrement();
+            if (ScoreboardManager.info.get(it).getAlive()){
+                ifGameOver.getAndIncrement();
+                aliveTeam.set(it);
+            }
         });
         if (ifGameOver.get() == 1){
-            GameOverEvent gameOverEvent = new GameOverEvent(Game.teams.get(0));
+            GameOverEvent gameOverEvent = new GameOverEvent(aliveTeam.get());
+            EventUtils.callEvent(gameOverEvent);
+        } else if (ifGameOver.get() == 0) {
+            Main.instance.getLogger().warning(ChatUtils.translateColor("#RED#请勿在玩家数不足4个时开始游戏"));
+
+            GameOverEvent gameOverEvent = new GameOverEvent(team);
             EventUtils.callEvent(gameOverEvent);
         }
     }

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

@@ -110,10 +110,14 @@ public void onEntityDismount(EntityDismountEvent event) {
             // 遍历team数组
             Game.teams.forEach(it -> {
                 // 如果被骑乘实体和离开骑乘实体的玩家是队友关系，就取消玩家的行为
-                if (it.isP2((Player) passenger) && it.isP1((Player) vehicle) && ScoreboardManager.info.get(it).getAlive()) {
-                    vehicle.eject();
-                    passenger.eject();
-                    vehicle.addPassenger(passenger);
+                if (it.isP2((Player) passenger) && it.isP1((Player) vehicle) && Game.scoreboardManager.getInfo(it).getAlive()) {
+                    try {
+                        vehicle.eject();
+                        passenger.eject();
+                        vehicle.addPassenger(passenger);
+                    } catch (Exception e) {
+                        Main.instance.getLogger().warning(ChatUtils.translateColor("#RED#又是奇奇怪怪的bug，罢了罢了"));
+                    }
                 }
             });
         }

src/main/resources/config.yml

@@ -50,4 +50,4 @@ resources:
       amount: 5
 
 # 刷新资源间隔ticks
-refresh-tick: 600
+refresh-tick: 20