Merge master into SlimTablist

src/de/steamwar/bungeecore/tablist/TablistServer.java

@@ -20,6 +20,7 @@
 package de.steamwar.bungeecore.tablist;
 
 import de.steamwar.bungeecore.Arenaserver;
+import de.steamwar.bungeecore.Servertype;
 import de.steamwar.bungeecore.Subserver;
 import de.steamwar.bungeecore.sql.SteamwarUser;
 import de.steamwar.bungeecore.sql.UserGroup;
@@ -120,6 +121,8 @@ public class TablistServer implements TablistPart {
         return players.stream().map(item -> {
             ProxiedPlayer p = BungeeCord.getInstance().getPlayer(item.getUuid());
             if (p == null) return item;
+            Subserver subserver = Subserver.getSubserver(p.getServer().getInfo());
+            if (subserver != null && subserver.getType() == Servertype.ARENA) return item;
             if (SteamwarUser.get(p.getUniqueId()).getTeam() != team) return item;
             return new Item(p, true);
         });