From 9dd85010b1d9d601cdfb6fe5963f28fee458b668 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Tue, 7 Nov 2023 21:13:16 +0100 Subject: [PATCH] Fixed Bulk Chunk 1.7 <-> 1.8 skylight handling --- .../types/BulkChunkType1_7_6.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_8to1_7_6_10/types/BulkChunkType1_7_6.java b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_8to1_7_6_10/types/BulkChunkType1_7_6.java index d17a9cb..b6d107f 100644 --- a/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_8to1_7_6_10/types/BulkChunkType1_7_6.java +++ b/src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_8to1_7_6_10/types/BulkChunkType1_7_6.java @@ -18,6 +18,7 @@ package net.raphimc.vialegacy.protocols.release.protocol1_8to1_7_6_10.types; import com.viaversion.viaversion.api.minecraft.chunks.Chunk; +import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.util.Pair; import io.netty.buffer.ByteBuf; @@ -127,9 +128,20 @@ public class BulkChunkType1_7_6 extends Type { deflater.end(); } + boolean skyLight = false; + loop1: + for (Chunk chunk : chunks) { + for (ChunkSection section : chunk.getSections()) { + if (section != null && section.getLight().hasSkyLight()) { + skyLight = true; + break loop1; + } + } + } + byteBuf.writeShort(chunkCount); byteBuf.writeInt(compressedSize); - this.writeHasSkyLight(byteBuf, true); + this.writeHasSkyLight(byteBuf, skyLight); byteBuf.writeBytes(compressedData, 0, compressedSize); for (int i = 0; i < chunkCount; i++) {