Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-12-26 02:57:37 +01:00
Code Issues Projects Releases Wiki Activity

Fix ChunkData including "fake" Block Entities (#556)

Browse Source
This commit is contained in:
Gatt 2021-12-27 19:45:15 +11:00 committed by TheMode
parent 90e88dc6e7
commit b8d51df58e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,11 +15,15 @@ import org.jglrxavpok.hephaistos.nbt.NBTCompound;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
public record ChunkData(@NotNull NBTCompound heightmaps, byte @NotNull [] data,
@NotNull Map<Integer, Block> blockEntities) implements Writeable {
public ChunkData {
blockEntities = Map.copyOf(blockEntities);
blockEntities = blockEntities.entrySet()
.stream()
.filter((entry) -> entry.getValue().registry().isBlockEntity())
.collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
}
public ChunkData(BinaryReader reader) {
@ -41,7 +45,6 @@ public record ChunkData(@NotNull NBTCompound heightmaps, byte @NotNull [] data,
final int index = entry.getKey();
final Block block = entry.getValue();
final var registry = block.registry();
if (!registry.isBlockEntity()) continue;
final Point point = ChunkUtils.getBlockPosition(index, 0, 0);
@ -50,7 +53,6 @@ public record ChunkData(@NotNull NBTCompound heightmaps, byte @NotNull [] data,
writer.writeVarInt(registry.blockEntityId());
NBTCompound resultNbt;
// Append handler tags
final BlockHandler handler = block.handler();