From 37fb319bd7438f755d6846d6e8efa81a300d9712 Mon Sep 17 00:00:00 2001 From: AlexProgrammerDE <40795980+AlexProgrammerDE@users.noreply.github.com> Date: Wed, 30 Nov 2022 19:10:39 +0100 Subject: [PATCH 1/2] Fix issue --- .../authmevelocity/velocity/listener/ProxyListener.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java index fdebbd8..cdaae0f 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java @@ -24,6 +24,10 @@ public final class ProxyListener { @Subscribe public EventTask onDisconnect(final DisconnectEvent event) { + if (event.getLoginStatus() == DisconnectEvent.LoginStatus.CONFLICTING_LOGIN) { + return EventTask.async(() -> {}); + } + return EventTask.async(() -> plugin.removePlayer(event.getPlayer())); } @@ -76,7 +80,7 @@ public final class ProxyListener { if (canBeIgnored(event.getPlayer())) { plugin.logDebug("PlayerChatEvent | Ignored signed player"); continuation.resume(); - return; + return; } event.setResult(PlayerChatEvent.ChatResult.denied()); @@ -113,5 +117,5 @@ public final class ProxyListener { && player.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_19_1) >= 0 && plugin.config().get().advanced().ignoreSignedPlayers(); } - + } From f8d6669c5febfacbee545cd843b4cb3a9ff26eb5 Mon Sep 17 00:00:00 2001 From: AlexProgrammerDE <40795980+AlexProgrammerDE@users.noreply.github.com> Date: Wed, 30 Nov 2022 19:20:11 +0100 Subject: [PATCH 2/2] Use null instead of empty task --- .../authmevelocity/velocity/listener/ProxyListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java index cdaae0f..7242663 100644 --- a/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java +++ b/velocity/src/main/java/me/adrianed/authmevelocity/velocity/listener/ProxyListener.java @@ -25,7 +25,7 @@ public final class ProxyListener { @Subscribe public EventTask onDisconnect(final DisconnectEvent event) { if (event.getLoginStatus() == DisconnectEvent.LoginStatus.CONFLICTING_LOGIN) { - return EventTask.async(() -> {}); + return null; } return EventTask.async(() -> plugin.removePlayer(event.getPlayer()));