From f23e4e8532657b9f697343794bbb2fe1a30eb8e6 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 11 Jun 2017 02:30:15 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=B8=D0=BC=D1=8F=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/asys/bridge/client/ClientPacketHandler.java | 5 ++--- .../java/asys/mcsmanager/server/ServerPacketHandler.java | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bridge/src/main/java/asys/bridge/client/ClientPacketHandler.java b/bridge/src/main/java/asys/bridge/client/ClientPacketHandler.java index 3dce8f3..54f2018 100644 --- a/bridge/src/main/java/asys/bridge/client/ClientPacketHandler.java +++ b/bridge/src/main/java/asys/bridge/client/ClientPacketHandler.java @@ -4,7 +4,6 @@ */ package asys.bridge.client; -import asys.bridge.bukkit.BridgePlugin; import asys.mcsmanager.packets.*; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableBiMap; @@ -24,7 +23,7 @@ public class ClientPacketHandler extends ChannelInboundHandlerAdapter implements ); private static Map, IPacketHandler> handshakeHandlers; - private static final BiMap> pingPackets = ImmutableBiMap.of( + private static final BiMap> knownPackets = ImmutableBiMap.of( 3, CS_Ping.class, 4, CS_ConsoleMessage.class, 5, SC_Command.class @@ -83,7 +82,7 @@ public class ClientPacketHandler extends ChannelInboundHandlerAdapter implements String.format("Handshake: #%d %s", packet.getErrorCode(), packet.getMessage())); bridge.setNeedReconnect(false); } else { - context.channel().attr(KNOWN_PACKETS).set(pingPackets); + context.channel().attr(KNOWN_PACKETS).set(knownPackets); bridge.getLogger().info("Handshake: OK"); bridge.startPing(context.channel()); } diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/server/ServerPacketHandler.java b/mcserver-manager/src/main/java/asys/mcsmanager/server/ServerPacketHandler.java index 241a64f..bb4bd42 100644 --- a/mcserver-manager/src/main/java/asys/mcsmanager/server/ServerPacketHandler.java +++ b/mcserver-manager/src/main/java/asys/mcsmanager/server/ServerPacketHandler.java @@ -25,7 +25,7 @@ class ServerPacketHandler extends ChannelInboundHandlerAdapter implements IPacke ); private static Map, IPacketHandler> handshakeHandlers; - private static final BiMap> pingPackets = ImmutableBiMap.of( + private static final BiMap> knownPackets = ImmutableBiMap.of( 3, CS_Ping.class, 4, CS_ConsoleMessage.class, 5, SC_Command.class @@ -94,7 +94,7 @@ class ServerPacketHandler extends ChannelInboundHandlerAdapter implements IPacke context.channel().write(HandshakeResult.OK); context.channel().attr(CLIENTID).set(packet.getClientId()); - context.channel().attr(KNOWN_PACKETS).set(pingPackets); + context.channel().attr(KNOWN_PACKETS).set(knownPackets); context.channel().attr(KNOWN_HANDLERS).set(pingHandlers); context.channel().flush(); }