diff --git a/src/main/java/net/minecraftforge/network/Channel.java b/src/main/java/net/minecraftforge/network/Channel.java index ffef4ac55d..5865d136f9 100644 --- a/src/main/java/net/minecraftforge/network/Channel.java +++ b/src/main/java/net/minecraftforge/network/Channel.java @@ -58,7 +58,7 @@ public abstract class Channel { return NetworkDirection.LOGIN_TO_CLIENT.buildPacket(data, getName()).getThis(); } else if (protocol == ConnectionProtocol.PLAY || protocol == ConnectionProtocol.CONFIGURATION) { var dir = serverbound ? NetworkDirection.PLAY_TO_SERVER : NetworkDirection.PLAY_TO_CLIENT; - return dir.buildPacket(toBuffer(message), getName()).getThis(); + return dir.buildPacket(data, getName()).getThis(); } else throw new IllegalStateException("Unsupported protocol " + protocol.name() + " in Forge Networking Channel"); } diff --git a/src/main/java/net/minecraftforge/network/packets/OpenContainer.java b/src/main/java/net/minecraftforge/network/packets/OpenContainer.java index 1ca37a09f9..4ba98547ae 100644 --- a/src/main/java/net/minecraftforge/network/packets/OpenContainer.java +++ b/src/main/java/net/minecraftforge/network/packets/OpenContainer.java @@ -44,7 +44,9 @@ public class OpenContainer { buf.writeVarInt(msg.id); buf.writeVarInt(msg.windowId); buf.writeComponent(msg.name); + msg.additionalData.markReaderIndex(); buf.writeByteArray(msg.additionalData.readByteArray()); + msg.additionalData.resetReaderIndex(); } public static OpenContainer decode(FriendlyByteBuf buf) { @@ -88,4 +90,4 @@ public class OpenContainer { public FriendlyByteBuf getAdditionalData() { return additionalData; } -} \ No newline at end of file +}