From b57de749ee4dec17411c3d1534238f14fa864be7 Mon Sep 17 00:00:00 2001 From: Kacper Geisheimer Date: Tue, 17 Mar 2020 14:26:33 +0100 Subject: [PATCH 1/2] [Bungee] Change PlayerDisconnectEvent priority to LOWEST --- .../bungeetablistplus/listener/TabListListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bungee/src/main/java/codecrafter47/bungeetablistplus/listener/TabListListener.java b/bungee/src/main/java/codecrafter47/bungeetablistplus/listener/TabListListener.java index 027e0dce..87341021 100644 --- a/bungee/src/main/java/codecrafter47/bungeetablistplus/listener/TabListListener.java +++ b/bungee/src/main/java/codecrafter47/bungeetablistplus/listener/TabListListener.java @@ -51,7 +51,7 @@ public void onPlayerJoin(PostLoginEvent e) { } } - @EventHandler(priority = EventPriority.HIGHEST) + @EventHandler(priority = EventPriority.LOWEST) public void onPlayerDisconnect(PlayerDisconnectEvent e) { try { TabView tabView = btlp.getTabViewManager().onPlayerDisconnect(e.getPlayer()); From d6d0a996f0aa53ab15eaffd1f86623a4540fe647 Mon Sep 17 00:00:00 2001 From: Kacper Geisheimer Date: Tue, 17 Mar 2020 15:08:15 +0100 Subject: [PATCH 2/2] [Bungee] Don't disconnect user manually from server --- .../bungeetablistplus/listener/TabListListener.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/bungee/src/main/java/codecrafter47/bungeetablistplus/listener/TabListListener.java b/bungee/src/main/java/codecrafter47/bungeetablistplus/listener/TabListListener.java index 87341021..76bac2b3 100644 --- a/bungee/src/main/java/codecrafter47/bungeetablistplus/listener/TabListListener.java +++ b/bungee/src/main/java/codecrafter47/bungeetablistplus/listener/TabListListener.java @@ -57,13 +57,6 @@ public void onPlayerDisconnect(PlayerDisconnectEvent e) { TabView tabView = btlp.getTabViewManager().onPlayerDisconnect(e.getPlayer()); btlp.getListener().onTabViewRemoved(tabView); btlp.getBungeePlayerProvider().onPlayerDisconnected(e.getPlayer()); - - // hack to revert changes from https://github.com/SpigotMC/BungeeCord/commit/830f18a35725f637d623594eaaad50b566376e59 - Server server = e.getPlayer().getServer(); - if (server != null) { - server.disconnect("Quitting"); - } - ((UserConnection) e.getPlayer()).setServer(null); } catch (Throwable th) { BungeeTabListPlus.getInstance().reportError(th); }