From f721cfaed6ea3de30d2eac07dff03f4156ddad28 Mon Sep 17 00:00:00 2001
From: Lixfel <agga-games@gmx.de>
Date: Fri, 30 Oct 2020 07:33:50 +0100
Subject: [PATCH] Hotfix NPE

Signed-off-by: Lixfel <agga-games@gmx.de>
---
 src/de/steamwar/bungeecore/listeners/TablistManager.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/de/steamwar/bungeecore/listeners/TablistManager.java b/src/de/steamwar/bungeecore/listeners/TablistManager.java
index 7f5d354a..b24c10e5 100644
--- a/src/de/steamwar/bungeecore/listeners/TablistManager.java
+++ b/src/de/steamwar/bungeecore/listeners/TablistManager.java
@@ -196,9 +196,12 @@ public class TablistManager extends BasicListener {
         }
 
         private String getTablistName(ProxiedPlayer p, boolean sameServer) {
-            String tablistName = Subserver.getSubserver(p).getTablistNames().get(p);
-            if(tablistName != null)
-                return tablistName;
+            Subserver server = Subserver.getSubserver(p);
+            if(server != null){
+                String tablistName = server.getTablistNames().get(p);
+                if(tablistName != null)
+                    return tablistName;
+            }
 
             StringBuilder st = new StringBuilder();
             if (p.hasPermission("bungeecore.group.admin")) st.append("§4");