Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-06 16:37:38 +01:00
Code Issues Projects Releases Wiki Activity

fix: send empty NBT tag on items without NBT data (fixes #66)

Browse Source
This commit is contained in:
mworzala 2023-10-17 01:09:41 -04:00
parent 517b195b5e
commit 5bcc72b911
No known key found for this signature in database
GPG Key ID: B148F922E64797C7
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/minestom/server/network/NetworkBufferTypes.java
View File

@ -236,7 +236,12 @@ final class NetworkBufferTypes {
buffer.nbtWriter = nbtWriter; buffer.nbtWriter = nbtWriter;
} }
try { try {
nbtWriter.writeNamed("", value); if (value == NBTEnd.INSTANCE) {
// Kotlin - https://discord.com/channels/706185253441634317/706186227493109860/1163703658341478462
buffer.write(BYTE, (byte) NBTType.TAG_End.getOrdinal());
} else {
nbtWriter.writeNamed("", value);
}
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -312,7 +317,10 @@ final class NetworkBufferTypes {
buffer.write(BOOLEAN, true); buffer.write(BOOLEAN, true);
buffer.write(VAR_INT, value.material().id()); buffer.write(VAR_INT, value.material().id());
buffer.write(BYTE, (byte) value.amount()); buffer.write(BYTE, (byte) value.amount());
buffer.write(NBT, value.meta().toNBT());
// Vanilla does not write an empty object, just an end tag.
NBTCompound nbt = value.meta().toNBT();
buffer.write(NBT, nbt.isEmpty() ? NBTEnd.INSTANCE : nbt);
return -1; return -1;
}, },
buffer -> { buffer -> {