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");