Merge branch 'master' into discord-bot
Dieser Commit ist enthalten in:
Commit
daa800a182
@ -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);
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren