From e6bcee3e73eb5218207544a17a8c1463b95b86e1 Mon Sep 17 00:00:00 2001 From: MiGoYAm Date: Thu, 23 Dec 2021 19:00:48 +0100 Subject: [PATCH] fix --- .../ru/nanit/limbo/connection/ClientConnection.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/ru/nanit/limbo/connection/ClientConnection.java b/src/main/java/ru/nanit/limbo/connection/ClientConnection.java index 353c4c57..9d585bf0 100644 --- a/src/main/java/ru/nanit/limbo/connection/ClientConnection.java +++ b/src/main/java/ru/nanit/limbo/connection/ClientConnection.java @@ -23,7 +23,6 @@ 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; @@ -224,7 +223,7 @@ private void fireLoginSuccess() { if (clientVersion.moreOrEqual(Version.V1_13)){ writePacket(PACKET_DECLARE_COMMANDS); - if(PACKET_PLUGIN_MESSAGE != null) + if (PACKET_PLUGIN_MESSAGE != null) writePacket(PACKET_PLUGIN_MESSAGE); } @@ -406,17 +405,15 @@ public static void initPackets(LimboServer server) { info.setGameMode(server.getConfig().getGameMode()); info.setUuid(uuid); + PacketDeclareCommands declareCommands = new PacketDeclareCommands(); + declareCommands.setCommands(Collections.emptyList()); + 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); - - 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); - } + PACKET_DECLARE_COMMANDS = PreEncodedPacket.of(declareCommands); if (server.getConfig().isUseBrandName()){ PacketPluginMessage pluginMessage = new PacketPluginMessage();