|
@@ -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;
|
|
}
|
|
}
|