From 8c3df0e1ddb0ffaa0460147da62326ddca0bf577 Mon Sep 17 00:00:00 2001
From: Lixfel <agga-games@gmx.de>
Date: Fri, 6 Nov 2020 13:40:59 +0100
Subject: [PATCH] Fix server order

Signed-off-by: Lixfel <agga-games@gmx.de>
---
 .../bungeecore/comms/handlers/TablistNameHandler.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/de/steamwar/bungeecore/comms/handlers/TablistNameHandler.java b/src/de/steamwar/bungeecore/comms/handlers/TablistNameHandler.java
index 6f049439..678d9305 100644
--- a/src/de/steamwar/bungeecore/comms/handlers/TablistNameHandler.java
+++ b/src/de/steamwar/bungeecore/comms/handlers/TablistNameHandler.java
@@ -12,6 +12,9 @@ public class TablistNameHandler implements SpigotHandler {
     @Override
     public void handle(ByteArrayDataInput byteArrayDataInput) {
         ProxiedPlayer player = ProxyServer.getInstance().getPlayer(SteamwarUser.get(byteArrayDataInput.readInt()).getUuid());
-        Subserver.getSubserver(player).getTablistNames().put(player, byteArrayDataInput.readUTF());
+        Subserver subserver = Subserver.getSubserver(player.getServer().getInfo());
+        if(subserver == null)
+            return;
+        subserver.getTablistNames().put(player, byteArrayDataInput.readUTF());
     }
 }