From a42e724f506dc53acedc7a1e2b28871075e32401 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Wed, 11 Dec 2019 23:51:39 -0500 Subject: [PATCH] Remove unneeded indirection in NBTType ByteBufInputStream implements DataInput, ByteBufOutputStream implements DataOutput. Use them to exploit native Netty ByteBuf calls where possible. --- .../ViaVersion/api/type/types/minecraft/NBTType.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/common/src/main/java/us/myles/ViaVersion/api/type/types/minecraft/NBTType.java b/common/src/main/java/us/myles/ViaVersion/api/type/types/minecraft/NBTType.java index f46d994f6..4e9ac52e2 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/type/types/minecraft/NBTType.java +++ b/common/src/main/java/us/myles/ViaVersion/api/type/types/minecraft/NBTType.java @@ -36,10 +36,7 @@ public class NBTType extends Type { return null; } else { buffer.readerIndex(readerIndex); - ByteBufInputStream bytebufStream = new ByteBufInputStream(buffer); - try (DataInputStream dataInputStream = new DataInputStream(bytebufStream)) { - return (CompoundTag) NBTIO.readTag((DataInput) dataInputStream); - } + return (CompoundTag) NBTIO.readTag((DataInput) new ByteBufInputStream(buffer)); } } @@ -49,11 +46,7 @@ public class NBTType extends Type { buffer.writeByte(0); } else { ByteBufOutputStream bytebufStream = new ByteBufOutputStream(buffer); - DataOutputStream dataOutputStream = new DataOutputStream(bytebufStream); - - NBTIO.writeTag((DataOutput) dataOutputStream, object); - - dataOutputStream.close(); + NBTIO.writeTag((DataOutput) bytebufStream, object); } } }