浏览代码

fixing server end error when no game world has been created yet

RedstoneFuture 3 年之前
父节点
当前提交
767ef80700
共有 1 个文件被更改,包括 7 次插入2 次删除
  1. 7 2
      missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/Game.java

+ 7 - 2
missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/Game.java

@@ -319,12 +319,17 @@ public class Game {
         stopTimer();
         stopTimer();
 
 
         applyForAllPlayers(player -> player.teleport(lobby.getAfterGameSpawn()));
         applyForAllPlayers(player -> player.teleport(lobby.getAfterGameSpawn()));
-        if (gameWorld.getWorldName() != null) {
+
+        if (gameWorld != null) {
             gameWorld.sendPlayersBack();
             gameWorld.sendPlayersBack();
             gameWorld.unload();
             gameWorld.unload();
             gameWorld.delete();
             gameWorld.delete();
         }
         }
-        scoreboardManager.removeScoreboard();
+
+        if (scoreboardManager != null) {
+            scoreboardManager.removeScoreboard();
+        }
+
         team1 = null;
         team1 = null;
         team2 = null;
         team2 = null;
     }
     }