1.5.0 Release Canidate 2 (Previously 1.4.3)

1 files changed, 4 insertions, 4 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Board.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Board.java
index a8e41c7..bb1984e 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/Board.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Board.java
@@ -79,11 +79,11 @@ public class Board {
     }
 
     public List<Player> getHiders() {
-        return Hider.stream().map(playerList::get).collect(Collectors.toList());
+        return Hider.stream().filter(Objects::nonNull).map(playerList::get).collect(Collectors.toList());
     }
 
     public List<Player> getSeekers() {
-        return Seeker.stream().map(playerList::get).collect(Collectors.toList());
+        return Seeker.stream().filter(Objects::nonNull).map(playerList::get).collect(Collectors.toList());
     }
 
     public Player getFirstSeeker() {
@@ -91,11 +91,11 @@ public class Board {
     }
 
     public List<Player> getSpectators() {
-        return Spectator.stream().map(playerList::get).collect(Collectors.toList());
+        return Spectator.stream().filter(Objects::nonNull).map(playerList::get).collect(Collectors.toList());
     }
 
     public List<Player> getPlayers() {
-        return new ArrayList<>(playerList.values());
+        return playerList.values().stream().filter(Objects::nonNull).collect(Collectors.toList());
     }
 
     public Player getPlayer(UUID uuid) {