Merge branch 'master' into ConvertFromWaterfall

src/de/steamwar/bungeecore/listeners/TablistManager.java

@@ -29,6 +29,7 @@ import de.steamwar.bungeecore.Subserver;
 import de.steamwar.bungeecore.comms.packets.FightInfoPacket;
 import de.steamwar.bungeecore.sql.SteamwarUser;
 import de.steamwar.bungeecore.sql.UserGroup;
+import net.md_5.bungee.BungeeCord;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
@@ -48,7 +49,11 @@ public class TablistManager extends BasicListener {
 
     @EventHandler
     public synchronized void onJoin(PostLoginEvent e){
-        tablists.put(e.getPlayer(), new Tablist(e.getPlayer()));
+        BungeeCord.getInstance().getScheduler().schedule(BungeeCore.get(), () -> {
+            if (e.getPlayer().isConnected()) {
+                tablists.put(e.getPlayer(), new Tablist(e.getPlayer()));
+            }
+        }, 1, TimeUnit.SECONDS);
     }
 
     @EventHandler