From fdcb80cb1e4d285886b4623d406e3fe7a8f6a948 Mon Sep 17 00:00:00 2001 From: bundabrg Date: Thu, 3 Sep 2020 09:45:40 +0800 Subject: [PATCH] Fix Login Errors * Show more meaningful error when a LoginException occurs * Handle the LoginPacket on error so a disconnect can be processed Closes #5 --- .../bedrock/handlers/BedrockUpstreamPacketHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/geyser-reversion/src/main/java/au/com/grieve/geyser/reversion/editions/bedrock/handlers/BedrockUpstreamPacketHandler.java b/geyser-reversion/src/main/java/au/com/grieve/geyser/reversion/editions/bedrock/handlers/BedrockUpstreamPacketHandler.java index bd9b25f..81bfe4e 100644 --- a/geyser-reversion/src/main/java/au/com/grieve/geyser/reversion/editions/bedrock/handlers/BedrockUpstreamPacketHandler.java +++ b/geyser-reversion/src/main/java/au/com/grieve/geyser/reversion/editions/bedrock/handlers/BedrockUpstreamPacketHandler.java @@ -74,8 +74,9 @@ public boolean handle(LoginPacket loginPacket) { packet.setJwt(serverSession.getLoginData().getHandshakeJwt().serialize()); session.sendUpstreamPacketImmediately(packet); } catch (LoginException e) { - session.disconnect("disconnectionScreen.internalError.cantConnect"); - session.getConnector().getLogger().error("Failed to encrypt connection", e); + session.disconnect("You are not able to connect. Please make sure your account is authorized to connect or contact the server administrator."); + session.getConnector().getLogger().error("Failed to encrypt connection: " + e.getMessage()); + return true; } // Setup Session