From 018d7b1e6fedbb8a3c8d92b8a34dce2b7f5a8d0f Mon Sep 17 00:00:00 2001
From: Nanit <nanitmix@gmail.com>
Date: Wed, 26 Jan 2022 18:47:31 +0200
Subject: [PATCH] Returning max version if using ip forwarding

---
 .../java/ru/nanit/limbo/connection/ClientConnection.java    | 4 ++++
 .../limbo/protocol/packets/status/PacketStatusResponse.java | 6 +++++-
 src/main/java/ru/nanit/limbo/server/Connections.java        | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/nanit/limbo/connection/ClientConnection.java b/src/main/java/ru/nanit/limbo/connection/ClientConnection.java
index 45f4156..c3969ad 100644
--- a/src/main/java/ru/nanit/limbo/connection/ClientConnection.java
+++ b/src/main/java/ru/nanit/limbo/connection/ClientConnection.java
@@ -91,6 +91,10 @@ public class ClientConnection extends ChannelInboundHandlerAdapter {
         return address;
     }
 
+    public Version getClientVersion() {
+        return clientVersion;
+    }
+
     @Override
     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
         if (state.equals(State.PLAY)) {
diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusResponse.java b/src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusResponse.java
index df08142..b15e41f 100644
--- a/src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusResponse.java
+++ b/src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusResponse.java
@@ -19,9 +19,13 @@ public class PacketStatusResponse implements PacketOut {
 
     @Override
     public void encode(ByteMessage msg, Version version) {
+        int protocol = server.getConfig().getInfoForwarding().isNone()
+                ? version.getProtocolNumber()
+                : Version.getMax().getProtocolNumber();
+
         String ver = server.getConfig().getPingData().getVersion();
         String desc = server.getConfig().getPingData().getDescription();
-        String json = getResponseJson(ver, version.getProtocolNumber(),
+        String json = getResponseJson(ver, protocol,
                 server.getConfig().getMaxPlayers(), server.getConnections().getCount(), desc);
 
         msg.writeString(json);
diff --git a/src/main/java/ru/nanit/limbo/server/Connections.java b/src/main/java/ru/nanit/limbo/server/Connections.java
index b4bf16b..0713516 100644
--- a/src/main/java/ru/nanit/limbo/server/Connections.java
+++ b/src/main/java/ru/nanit/limbo/server/Connections.java
@@ -27,7 +27,8 @@ public final class Connections {
 
     public void addConnection(ClientConnection connection) {
         connections.put(connection.getUuid(), connection);
-        Logger.info("Player %s connected (%s)", connection.getUsername(), connection.getAddress());
+        Logger.info("Player %s connected (%s) [%s]", connection.getUsername(),
+                connection.getAddress(), connection.getClientVersion());
     }
 
     public void removeConnection(ClientConnection connection) {