From e42dca22ea92a66aa1c92c6e09d12583803855e6 Mon Sep 17 00:00:00 2001 From: Nanit Date: Fri, 27 Nov 2020 20:24:52 +0200 Subject: [PATCH] Fixed legacy forwarding. Minor changes --- .../java/ru/nanit/limbo/connection/ClientConnection.java | 8 +++++--- src/main/resources/settings.yml | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/ru/nanit/limbo/connection/ClientConnection.java b/src/main/java/ru/nanit/limbo/connection/ClientConnection.java index 3983130..4cbf956 100644 --- a/src/main/java/ru/nanit/limbo/connection/ClientConnection.java +++ b/src/main/java/ru/nanit/limbo/connection/ClientConnection.java @@ -92,7 +92,7 @@ public class ClientConnection extends ChannelInboundHandlerAdapter { setAddress(split[1]); profile.setUuid(UuidUtil.fromString(split[2])); } else { - disconnect("You've enabled player info forwarding. To join, enable it in your proxy too"); + disconnect("You've enabled player info forwarding. You need to connect with proxy"); } } } @@ -126,9 +126,11 @@ public class ClientConnection extends ChannelInboundHandlerAdapter { return; } - if (server.getConfig().getInfoForwarding().isNone()){ + if (!server.getConfig().getInfoForwarding().isModern()){ profile.setUsername(((PacketLoginStart) packet).getUsername()); - profile.setUuid(UuidUtil.getOfflineModeUuid(getUsername())); + + if (profile.getUuid() == null) + profile.setUuid(UuidUtil.getOfflineModeUuid(getUsername())); } fireLoginSuccess(); diff --git a/src/main/resources/settings.yml b/src/main/resources/settings.yml index b5cc77b..40a8546 100644 --- a/src/main/resources/settings.yml +++ b/src/main/resources/settings.yml @@ -21,7 +21,7 @@ dimension: THE_END # Spawn position in the world spawnPosition: x: 0.0 - y: 32.0 + y: 64.0 z: 0.0 yaw: 0.0 pitch: 0.0