Merge pull request #63 from AlexProgrammerDE/master

This commit is contained in:
Adrian 2022-11-30 14:54:18 -05:00 committed by GitHub
commit 017e698460
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -24,6 +24,10 @@ public final class ProxyListener {
@Subscribe @Subscribe
public EventTask onDisconnect(final DisconnectEvent event) { public EventTask onDisconnect(final DisconnectEvent event) {
if (event.getLoginStatus() == DisconnectEvent.LoginStatus.CONFLICTING_LOGIN) {
return null;
}
return EventTask.async(() -> plugin.removePlayer(event.getPlayer())); return EventTask.async(() -> plugin.removePlayer(event.getPlayer()));
} }
@ -76,7 +80,7 @@ public final class ProxyListener {
if (canBeIgnored(event.getPlayer())) { if (canBeIgnored(event.getPlayer())) {
plugin.logDebug("PlayerChatEvent | Ignored signed player"); plugin.logDebug("PlayerChatEvent | Ignored signed player");
continuation.resume(); continuation.resume();
return; return;
} }
event.setResult(PlayerChatEvent.ChatResult.denied()); event.setResult(PlayerChatEvent.ChatResult.denied());
@ -113,5 +117,5 @@ public final class ProxyListener {
&& player.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_19_1) >= 0 && player.getProtocolVersion().compareTo(ProtocolVersion.MINECRAFT_1_19_1) >= 0
&& plugin.config().get().advanced().ignoreSignedPlayers(); && plugin.config().get().advanced().ignoreSignedPlayers();
} }
} }