Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-06-22 20:44:54 +02:00
Code Issues Projects Releases Wiki Activity

Include block nbt fix

Browse Source 
Signed-off-by: TheMode <themode@outlook.fr>
This commit is contained in:
TheMode 2021-11-04 08:18:32 +01:00
parent e3b59c3b95
commit f4db54d6e5
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/net/minestom/server/network/packet/server/play/data/ChunkData.java
View File

@ -47,23 +47,26 @@ public final class ChunkData implements Writeable {
writer.writeVarInt(registry.blockEntityId());
final NBTCompound resultNbt = new NBTCompound();
{
// Append handler tags
final BlockHandler handler = block.handler();
if (handler != null) {
final NBTCompound blockNbt = Objects.requireNonNullElseGet(block.nbt(), NBTCompound::new);
for (Tag<?> tag : handler.getBlockEntityTags()) {
final var value = tag.read(blockNbt);
if (value != null) {
// Tag is present and valid
tag.writeUnsafe(resultNbt, value);
}
NBTCompound resultNbt;
// Append handler tags
final BlockHandler handler = block.handler();
if (handler != null) {
resultNbt = new NBTCompound();
final NBTCompound blockNbt = Objects.requireNonNullElseGet(block.nbt(), NBTCompound::new);
for (Tag<?> tag : handler.getBlockEntityTags()) {
final var value = tag.read(blockNbt);
if (value != null) {
// Tag is present and valid
tag.writeUnsafe(resultNbt, value);
}
}
} else {
// Complete nbt shall be sent if the block has no handler
// Necessary to support all vanilla blocks
final NBTCompound blockNbt = block.nbt();
resultNbt = blockNbt == null ? new NBTCompound() : blockNbt;
}
writer.writeNBT("", resultNbt); // block nbt
if (resultNbt != null) writer.writeNBT("", resultNbt); // block nbt
}
}
}