Skip to content

Commit e8325ef

Browse files
committed
[Fix] NPE
1 parent c5641a5 commit e8325ef

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/main/java/io/ib67/manhunt/game/Game.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ public void stop(GameResult result) {
127127
ManHunt.getInstance().getLanguage().GAMING.HUNTER.WON :
128128
ManHunt.getInstance().getLanguage().GAMING.RUNNER.WON;
129129
inGamePlayers.stream().map(GamePlayer::getPlayer).forEach(p -> {
130+
if (p == null) return;
130131
p.setGameMode(GameMode.SPECTATOR);
131132
p.teleport(Bukkit.getWorlds().get(0).getSpawnLocation());
132133
p.sendTitle(title, "", 20, 2 * 20, 20);
@@ -187,7 +188,11 @@ public void kickPlayer(String player) {
187188

188189

189190
public Optional<GamePlayer> isInGame(Player player) {
190-
return inGamePlayers.stream().filter(s -> s.getPlayer().getName().equals(player.getName())).findFirst();
191+
return inGamePlayers.stream().filter(s -> {
192+
Player playe = s.getPlayer();
193+
if (playe == null) return false;
194+
return playe.getName().equals(player.getName());
195+
}).findFirst();
191196
}
192197

193198
public List<GamePlayer> getInGamePlayers() {

0 commit comments

Comments
 (0)