From d49a16ba35d31d92fe34c6abb044227e55df9403 Mon Sep 17 00:00:00 2001 From: MiGoYAm Date: Thu, 23 Dec 2021 13:15:14 +0100 Subject: [PATCH] Send PacketDeclareCommand only when limbo is connected to proxy --- .../ru/nanit/limbo/connection/ClientConnection.java | 11 +++++++---- 1 file changed, 7 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 e0b7473..353c4c5 100644 --- a/src/main/java/ru/nanit/limbo/connection/ClientConnection.java +++ b/src/main/java/ru/nanit/limbo/connection/ClientConnection.java @@ -23,6 +23,7 @@ import ru.nanit.limbo.protocol.packets.status.PacketStatusResponse; import ru.nanit.limbo.protocol.registry.State; import ru.nanit.limbo.protocol.registry.Version; import ru.nanit.limbo.server.LimboServer; +import ru.nanit.limbo.server.data.InfoForwarding; import ru.nanit.limbo.server.data.Title; import ru.nanit.limbo.util.Logger; import ru.nanit.limbo.util.UuidUtil; @@ -405,15 +406,17 @@ public class ClientConnection extends ChannelInboundHandlerAdapter { info.setGameMode(server.getConfig().getGameMode()); info.setUuid(uuid); - PacketDeclareCommands declareCommands = new PacketDeclareCommands(); - declareCommands.setCommands(Collections.singletonList("limbo")); - PACKET_LOGIN_SUCCESS = PreEncodedPacket.of(loginSuccess); PACKET_JOIN_GAME = PreEncodedPacket.of(joinGame); PACKET_PLAYER_ABILITIES = PreEncodedPacket.of(playerAbilities); PACKET_PLAYER_POS = PreEncodedPacket.of(positionAndLook); PACKET_PLAYER_INFO = PreEncodedPacket.of(info); - PACKET_DECLARE_COMMANDS = PreEncodedPacket.of(declareCommands); + + if (!server.getConfig().getInfoForwarding().isNone()){// or server.getConfig().getInfoForwarding().getType() != InfoForwarding.Type.NONE + PacketDeclareCommands declareCommands = new PacketDeclareCommands(); + declareCommands.setCommands(Collections.emptyList()); + PACKET_DECLARE_COMMANDS = PreEncodedPacket.of(declareCommands); + } if (server.getConfig().isUseBrandName()){ PacketPluginMessage pluginMessage = new PacketPluginMessage();