From 09e715a4494ecd4464085eb4cd426729c87fa2b5 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 4 Jan 2022 00:27:23 +0100 Subject: [PATCH] fix SendTestMessageCommand --- .../krakatoa/proxy/command/SendTestMessageCommand.java | 8 +++++--- .../proxy/listener/SocketClientMessageListener.java | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/krakatoa/proxy/command/SendTestMessageCommand.java b/src/main/java/net/krakatoa/proxy/command/SendTestMessageCommand.java index d17f5c8..0722e1f 100644 --- a/src/main/java/net/krakatoa/proxy/command/SendTestMessageCommand.java +++ b/src/main/java/net/krakatoa/proxy/command/SendTestMessageCommand.java @@ -24,14 +24,16 @@ public class SendTestMessageCommand extends Command { if (args.length == 5) { int cmdID; - if (Byte.parseByte(args[0]) == KraSocketClientProtocolStatus.GET.getStatus()) { + byte status = Byte.parseByte(args[0]); + + if (status == KraSocketClientProtocolStatus.GET.getStatus()) { cmdID = ProxySystem.getInstance().getKraSocketClientProtocol().generateCmdID(); } else { - cmdID = Byte.parseByte(args[0]); + cmdID = Byte.parseByte(args[1]); } KraSocketClientProtocolMessage kraSocketClientProtocolMessage = new KraSocketClientProtocolMessage( - (byte) cmdID, Integer.parseInt(args[1]), Integer.parseInt(args[2]), + status, (byte) cmdID, Integer.parseInt(args[2]), proxiedPlayer.getUniqueId().toString(), Short.parseShort(args[3]), args[4]); ProxySystem.getInstance().getKraSocketClient().getSocketClient() diff --git a/src/main/java/net/krakatoa/proxy/listener/SocketClientMessageListener.java b/src/main/java/net/krakatoa/proxy/listener/SocketClientMessageListener.java index 1897178..1f9513c 100644 --- a/src/main/java/net/krakatoa/proxy/listener/SocketClientMessageListener.java +++ b/src/main/java/net/krakatoa/proxy/listener/SocketClientMessageListener.java @@ -47,7 +47,6 @@ public class SocketClientMessageListener implements KraSocketClientEventInterfac .containsKey(kraProtocolMessage.getCmdID())) { Consumer consumer = ProxySystem.getInstance() .getKraSocketClientProtocol().getConsumerHashMap().get(kraProtocolMessage.getCmdID()); - if (consumer != null) { ProxySystem.getInstance().getLogger() .info("accept " + kraProtocolMessage.getCmdID());