SteamWar/BungeeCore
Archiviert
13
2

Merge branch 'master' into discord-bot

Dieser Commit ist enthalten in:
YoyoNow 2021-07-29 00:02:40 +02:00
Commit daa800a182

Datei anzeigen

@ -193,7 +193,7 @@ public class TablistManager extends BasicListener {
Team team = getTeam(player); Team team = getTeam(player);
List<ProxiedPlayer> players = playerMap.get(server) List<ProxiedPlayer> players = playerMap.get(server)
.stream() .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()); .collect(Collectors.toList());
Subserver subserver = Subserver.getSubserver(player); Subserver subserver = Subserver.getSubserver(player);