Merge remote-tracking branch 'upstream/master' into fix/1.20.40

Signed-off-by: GitHub <[email protected]>
Kas-tle · Oct 27, 2023 · baa57f3 · baa57f3
2 parents 3bc6d16 + 8d2ebcf
commit baa57f3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...org/geysermc/geyser/translator/protocol/java/level/JavaLevelChunkWithLightTranslator.java b/...org/geysermc/geyser/translator/protocol/java/level/JavaLevelChunkWithLightTranslator.java
@@ -111,6 +111,7 @@ public void translate(GeyserSession session, ClientboundLevelChunkWithLightPacke
         int maxBedrockSectionY = (bedrockDimension.height() >> 4) - 1;
 
         int sectionCount;
+        int subChunkCount;
         byte[] payload;
         ByteBuf byteBuf = null;
         GeyserChunkSection[] sections = new GeyserChunkSection[javaChunks.length - (yOffset + (bedrockDimension.minY() >> 4))];
@@ -475,6 +476,7 @@ public void translate(GeyserSession session, ClientboundLevelChunkWithLightPacke
                 GeyserChunkSection section = sections[i];
                 if (section != null) {
                     section.writeToNetwork(byteBuf);
+                    subChunkCount++;
                 }
                 // We can ignore empty sections with subchunk v9
             }
@@ -516,7 +518,7 @@ public void translate(GeyserSession session, ClientboundLevelChunkWithLightPacke
         }
 
         LevelChunkPacket levelChunkPacket = new LevelChunkPacket();
-        levelChunkPacket.setSubChunksLength(sectionCount);
+        levelChunkPacket.setSubChunksLength(subChunkCount);
         levelChunkPacket.setCachingEnabled(false);
         levelChunkPacket.setChunkX(packet.getX());
         levelChunkPacket.setChunkZ(packet.getZ());