Mirrors/ViaVersion
3
0
Fork 1
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-12-28 09:00:09 +01:00
Code Issues Releases Aktivität

Don't read remaining bytes in 1.18 chunk type

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Nassim Jahnke 2021-09-16 17:01:58 +02:00
Ursprung 111cd2fd46
Commit c5e27b89af
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 6BE3B555EBC5982B
1 geänderte Dateien mit 7 neuen und 13 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

20
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/types/Chunk1_18Type.java
Datei anzeigen

@ -19,7 +19,6 @@ package com.viaversion.viaversion.protocols.protocol1_18to1_17_1.types;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity; import com.viaversion.viaversion.api.minecraft.blockentity.BlockEntity;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk; import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
import com.viaversion.viaversion.api.minecraft.chunks.Chunk1_18; import com.viaversion.viaversion.api.minecraft.chunks.Chunk1_18;
@ -47,12 +46,15 @@ public final class Chunk1_18Type extends Type<Chunk> {
final int chunkZ = buffer.readInt(); final int chunkZ = buffer.readInt();
final CompoundTag heightMap = Type.NBT.read(buffer); final CompoundTag heightMap = Type.NBT.read(buffer);
Type.VAR_INT.readPrimitive(buffer); // Data size in bytes
// Read sections // Read sections
final ByteBuf sectionsBuf = buffer.readBytes(Type.VAR_INT.readPrimitive(buffer));
final ChunkSection[] sections = new ChunkSection[ySectionCount]; final ChunkSection[] sections = new ChunkSection[ySectionCount];
for (int i = 0; i < ySectionCount; i++) { try {
sections[i] = Types1_18.CHUNK_SECTION.read(buffer); for (int i = 0; i < ySectionCount; i++) {
sections[i] = Types1_18.CHUNK_SECTION.read(sectionsBuf);
}
} finally {
sectionsBuf.release();
} }
final int blockEntitiesLength = Type.VAR_INT.readPrimitive(buffer); final int blockEntitiesLength = Type.VAR_INT.readPrimitive(buffer);
@ -61,14 +63,6 @@ public final class Chunk1_18Type extends Type<Chunk> {
blockEntities.add(Types1_18.BLOCK_ENTITY.read(buffer)); blockEntities.add(Types1_18.BLOCK_ENTITY.read(buffer));
} }
// Read all the remaining bytes (workaround for #681)
if (buffer.readableBytes() > 0) {
final byte[] array = Type.REMAINING_BYTES.read(buffer);
if (Via.getManager().isDebug()) {
Via.getPlatform().getLogger().warning("Found " + array.length + " more bytes than expected while reading the chunk: " + chunkX + "/" + chunkZ);
}
}
return new Chunk1_18(chunkX, chunkZ, sections, heightMap, blockEntities); return new Chunk1_18(chunkX, chunkZ, sections, heightMap, blockEntities);
} }