Merge branch 'master' into discord-bot

src/de/steamwar/bungeecore/listeners/TablistManager.java

@@ -193,7 +193,7 @@ public class TablistManager extends BasicListener {
                     Team team = getTeam(player);
                     List<ProxiedPlayer> players = playerMap.get(server)
                             .stream()
-                            .filter(p -> p.getServer().getInfo() == currentServer || SteamwarUser.get(p).getUserGroup() != UserGroup.Member || (team != null && team == getTeam(p)))
+                            .filter(p -> (p.getServer() != null && p.getServer().getInfo() == currentServer) || SteamwarUser.get(p).getUserGroup() != UserGroup.Member || (team != null && team == getTeam(p)))
                             .collect(Collectors.toList());
 
                     Subserver subserver = Subserver.getSubserver(player);