From 385d62f8c67d76b55247c6075e1c6f98319977b4 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Sun, 28 Oct 2018 21:16:15 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B1=D1=80=D0=BE=D1=81=D0=B0=D1=82=D1=8C=20?= =?UTF-8?q?=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=BD=D0=B5=D1=83=D0=B4=D0=B0=D1=87=D0=BD?= =?UTF-8?q?=D0=BE=D0=B9=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D0=B8=20=D0=BF?= =?UTF-8?q?=D0=B0=D0=BA=D0=B5=D1=82=D0=B0=20=D0=B2=20=D1=81=D0=B5=D1=82?= =?UTF-8?q?=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proto_1_12_2/netty/PacketEncoder.java | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketEncoder.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketEncoder.java index 7e92a18..324b9f7 100644 --- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketEncoder.java +++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PacketEncoder.java @@ -13,8 +13,10 @@ import mc.core.network.SCPacket; import mc.core.network.proto_1_12_2.ByteArrayOutputNetStream; import mc.core.network.proto_1_12_2.State; import mc.core.network.proto_1_12_2.netty.wrappers.WrapperNetOutputStream; +import org.slf4j.helpers.MessageFormatter; import static mc.core.network.proto_1_12_2.netty.NettyServer.ATTR_STATE; +import static org.slf4j.helpers.MessageFormatter.format; @Slf4j public class PacketEncoder extends MessageToByteEncoder { @@ -41,13 +43,17 @@ public class PacketEncoder extends MessageToByteEncoder { log.debug("Send {}:{}", state, packet); - NetOutputStream netStream = new ByteArrayOutputNetStream(); - packet.writeSelf(netStream); - byte[] bytes = ((ByteArrayOutputNetStream) netStream).toByteArray(); - netStream = new WrapperNetOutputStream(out); + try { + NetOutputStream netStream = new ByteArrayOutputNetStream(); + packet.writeSelf(netStream); + byte[] bytes = ((ByteArrayOutputNetStream) netStream).toByteArray(); + netStream = new WrapperNetOutputStream(out); - netStream.writeVarInt(bytes.length + sizeVarInt(id)); - netStream.writeVarInt(id); - netStream.writeBytes(bytes); + netStream.writeVarInt(bytes.length + sizeVarInt(id)); + netStream.writeVarInt(id); + netStream.writeBytes(bytes); + } catch (Throwable t) { + log.error(format("Error encoding packet {}:{}", state, packet).getMessage(), t); + } } }