diff --git a/src/ClientTesting.py b/src/ClientTesting.py index 3bec835..c096150 100644 --- a/src/ClientTesting.py +++ b/src/ClientTesting.py @@ -1,4 +1,4 @@ -import asyncore, socket +import asyncore, socket, binascii class ClientTest(asyncore.dispatcher): @@ -17,7 +17,7 @@ class ClientTest(asyncore.dispatcher): def handle_read(self): print "handle_read" - print self.recv(8192) + print binascii.hexlify(self.recv(8192)) def handle_write(self): sent = self.send(self.buffer) diff --git a/src/main/java/mcp/mobius/opis/network/rconserver/RConServer.java b/src/main/java/mcp/mobius/opis/network/rconserver/RConServer.java index e2659d7..3c3ae3b 100644 --- a/src/main/java/mcp/mobius/opis/network/rconserver/RConServer.java +++ b/src/main/java/mcp/mobius/opis/network/rconserver/RConServer.java @@ -94,9 +94,13 @@ public class RConServer implements Runnable { ChannelHandlerContext ctx = RConServer.instance.fakePlayers.get(player); packet.encode(output); - ByteBuf msg = ctx.alloc().buffer(output.toByteArray().length); - msg.writeBytes(output.toByteArray()); - ctx.write(msg); + byte[] data = output.toByteArray(); + + ByteBuf buf = ctx.alloc().buffer(data.length); + buf.writeInt(data.length); + buf.writeByte(packetTypes.indexOf(packet.getClass())); + buf.writeBytes(data); + ctx.write(buf); ctx.flush(); modOpis.log.info("We should be sending back something here");