From 356db56da32c2b1aa0cc4a0ade0a2eda62eeb09b Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Tue, 25 Oct 2022 21:14:51 +0200
Subject: [PATCH] Hotfix weird tablist behaviour

---
 src/de/steamwar/bungeecore/tablist/TablistServer.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/de/steamwar/bungeecore/tablist/TablistServer.java b/src/de/steamwar/bungeecore/tablist/TablistServer.java
index a479720e..6c67d56b 100644
--- a/src/de/steamwar/bungeecore/tablist/TablistServer.java
+++ b/src/de/steamwar/bungeecore/tablist/TablistServer.java
@@ -93,7 +93,8 @@ public class TablistServer implements TablistPart {
         return players.stream().map(item -> {
             ProxiedPlayer p = BungeeCord.getInstance().getPlayer(item.getUuid());
             if (p == null) return item;
-            if (Subserver.getSubserver(p.getServer().getInfo()).getType() == Servertype.ARENA) 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);
         });