Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-29 23:17:59 +02:00
Code Issues Projects Releases Wiki Activity

Fix test

Browse Source
This commit is contained in:
TheMode 2021-07-11 19:22:21 +02:00
parent 9db185f8a1
commit cd090e13d0
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/net/minestom/server/network/packet/server/play/ChunkDataPacket.java
View File

@ -8,6 +8,7 @@ import net.minestom.server.MinecraftServer;
import net.minestom.server.instance.Section; import net.minestom.server.instance.Section;
import net.minestom.server.instance.block.Block; import net.minestom.server.instance.block.Block;
import net.minestom.server.instance.block.BlockHandler; import net.minestom.server.instance.block.BlockHandler;
import net.minestom.server.instance.palette.Palette;
import net.minestom.server.network.packet.server.ServerPacket; import net.minestom.server.network.packet.server.ServerPacket;
import net.minestom.server.network.packet.server.ServerPacketIdentifier; import net.minestom.server.network.packet.server.ServerPacketIdentifier;
import net.minestom.server.tag.Tag; import net.minestom.server.tag.Tag;
@ -184,20 +185,21 @@ public class ChunkDataPacket implements ServerPacket, CacheablePacket {
} }
// Data // Data
/*this.paletteStorage = new PaletteStorage(8, 1);
int blockArrayLength = reader.readVarInt(); int blockArrayLength = reader.readVarInt();
if (maskCount > 0) { if (maskCount > 0) {
final long mask = masks[0]; // TODO support for variable size final long mask = masks[0]; // TODO support for variable size
for (int section = 0; section < CHUNK_SECTION_COUNT; section++) { for (int sectionIndex = 0; sectionIndex < CHUNK_SECTION_COUNT; sectionIndex++) {
boolean hasSection = (mask & 1 << section) != 0; boolean hasSection = (mask & 1 << sectionIndex) != 0;
if (!hasSection) if (!hasSection)
continue; continue;
final Section section = sections.computeIfAbsent(sectionIndex, i -> new Section());
final Palette palette = section.getPalette();
short blockCount = reader.readShort(); short blockCount = reader.readShort();
byte bitsPerEntry = reader.readByte(); byte bitsPerEntry = reader.readByte();
// Resize palette if necessary // Resize palette if necessary
if (bitsPerEntry > paletteStorage.getSection(section).getBitsPerEntry()) { if (bitsPerEntry > palette.getBitsPerEntry()) {
paletteStorage.getSection(section).resize(bitsPerEntry); palette.resize(bitsPerEntry);
} }
// Retrieve palette values // Retrieve palette values
@ -205,19 +207,19 @@ public class ChunkDataPacket implements ServerPacket, CacheablePacket {
int paletteSize = reader.readVarInt(); int paletteSize = reader.readVarInt();
for (int i = 0; i < paletteSize; i++) { for (int i = 0; i < paletteSize; i++) {
final int paletteValue = reader.readVarInt(); final int paletteValue = reader.readVarInt();
paletteStorage.getSection(section).getPaletteBlockMap().put((short) i, (short) paletteValue); palette.getPaletteBlockMap().put((short) i, (short) paletteValue);
paletteStorage.getSection(section).getBlockPaletteMap().put((short) paletteValue, (short) i); palette.getBlockPaletteMap().put((short) paletteValue, (short) i);
} }
} }
// Read blocks // Read blocks
int dataLength = reader.readVarInt(); int dataLength = reader.readVarInt();
long[] data = paletteStorage.getSection(section).getBlocks(); long[] data = palette.getBlocks();
for (int i = 0; i < dataLength; i++) { for (int i = 0; i < dataLength; i++) {
data[i] = reader.readLong(); data[i] = reader.readLong();
} }
} }
}*/ }
// Block entities // Block entities
final int blockEntityCount = reader.readVarInt(); final int blockEntityCount = reader.readVarInt();