[Fix] NPE

Server-CT · Nov 21, 2020 · e8325ef · e8325ef
1 parent c5641a5
commit e8325ef
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/io/ib67/manhunt/game/Game.java b/src/main/java/io/ib67/manhunt/game/Game.java
@@ -127,6 +127,7 @@ public void stop(GameResult result) {
                 ManHunt.getInstance().getLanguage().GAMING.HUNTER.WON :
                 ManHunt.getInstance().getLanguage().GAMING.RUNNER.WON;
         inGamePlayers.stream().map(GamePlayer::getPlayer).forEach(p -> {
+            if (p == null) return;
             p.setGameMode(GameMode.SPECTATOR);
             p.teleport(Bukkit.getWorlds().get(0).getSpawnLocation());
             p.sendTitle(title, "", 20, 2 * 20, 20);
@@ -187,7 +188,11 @@ public void kickPlayer(String player) {
 
 
     public Optional<GamePlayer> isInGame(Player player) {
-        return inGamePlayers.stream().filter(s -> s.getPlayer().getName().equals(player.getName())).findFirst();
+        return inGamePlayers.stream().filter(s -> {
+            Player playe = s.getPlayer();
+            if (playe == null) return false;
+            return playe.getName().equals(player.getName());
+        }).findFirst();
     }
 
     public List<GamePlayer> getInGamePlayers() {