From 7a6d3f4604464b208edc1e5f0a9129c230970c57 Mon Sep 17 00:00:00 2001
From: SupremeMortal <6178101+SupremeMortal@users.noreply.github.com>
Date: Fri, 13 Sep 2019 10:08:48 +0100
Subject: [PATCH] Various chunk tweaks.

---
 .../java/world/JavaChunkDataTranslator.java        | 14 ++++++--------
 .../org/geysermc/connector/utils/ChunkUtils.java   |  6 ++++--
 .../connector/world/chunk/BlockStorage.java        |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaChunkDataTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaChunkDataTranslator.java
index 3b77619f..1f552d12 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaChunkDataTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaChunkDataTranslator.java
@@ -21,17 +21,15 @@ public class JavaChunkDataTranslator extends PacketTranslator<ServerChunkDataPac
             try {
                 ChunkUtils.ChunkData chunkData = ChunkUtils.translateToBedrock(packet.getColumn());
                 ByteBuf byteBuf = Unpooled.buffer(32);
-                int count = 0;
                 ChunkSection[] sections = chunkData.sections;
-                for (int i = sections.length - 1; i >= 0; i--) {
-                    if (sections[i].isEmpty())
-                        continue;
 
-                    count = i + 1;
-                    break;
+                int sectionCount = 16;
+                while (sections[sectionCount].isEmpty()) {
+                    sectionCount--;
                 }
+                sectionCount++;
 
-                for (int i = 0; i < count; i++) {
+                for (int i = 0; i < sectionCount; i++) {
                     ChunkSection section = chunkData.sections[i];
                     section.writeToNetwork(byteBuf);
                 }
@@ -44,7 +42,7 @@ public class JavaChunkDataTranslator extends PacketTranslator<ServerChunkDataPac
                 byteBuf.readBytes(payload);
 
                 LevelChunkPacket levelChunkPacket = new LevelChunkPacket();
-                levelChunkPacket.setSubChunksLength(count);
+                levelChunkPacket.setSubChunksLength(sectionCount);
                 levelChunkPacket.setCachingEnabled(false);
                 levelChunkPacket.setChunkX(packet.getColumn().getX());
                 levelChunkPacket.setChunkZ(packet.getColumn().getZ());
diff --git a/connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java b/connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java
index 9e7ad391..89020b67 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java
@@ -7,6 +7,7 @@ import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
 import org.geysermc.connector.network.translators.TranslatorsInit;
 import org.geysermc.connector.network.translators.item.BedrockItem;
 import org.geysermc.connector.world.chunk.ChunkSection;
+import org.geysermc.connector.world.chunk.bitarray.BitArrayVersion;
 
 public class ChunkUtils {
 
@@ -69,7 +70,7 @@ public class ChunkUtils {
             ChunkSection section = chunkData.sections[chunkY];
 
             section.getBlockStorageArray()[0] = new org.geysermc.connector.world.chunk.BlockStorage();
-            section.getBlockStorageArray()[1] = new org.geysermc.connector.world.chunk.BlockStorage();
+            section.getBlockStorageArray()[1] = new org.geysermc.connector.world.chunk.BlockStorage(BitArrayVersion.V1);
 
             for (int x = 0; x < 16; x++) {
                 for (int y = 0; y < 16; y++) {
@@ -77,7 +78,8 @@ public class ChunkUtils {
                         BlockState block = storage.get(x, y, z);
                         BedrockItem bedrockBlock = TranslatorsInit.getItemTranslator().getBedrockBlock(block);
 
-                        section.getBlockStorageArray()[0].setFullBlock(ChunkSection.blockPosition(x, y, z), bedrockBlock.getId() << 4 | bedrockBlock.getData());
+                        section.getBlockStorageArray()[0].setFullBlock(ChunkSection.blockPosition(x, y, z),
+                                bedrockBlock.getId() << 4 | bedrockBlock.getData());
                     }
                 }
             }
diff --git a/connector/src/main/java/org/geysermc/connector/world/chunk/BlockStorage.java b/connector/src/main/java/org/geysermc/connector/world/chunk/BlockStorage.java
index c957d840..db38d4bb 100644
--- a/connector/src/main/java/org/geysermc/connector/world/chunk/BlockStorage.java
+++ b/connector/src/main/java/org/geysermc/connector/world/chunk/BlockStorage.java
@@ -56,9 +56,9 @@ public class BlockStorage {
             buffer.writeIntLE(word);
         }
 
-        VarInts.writeUnsignedInt(buffer, palette.size());
+        VarInts.writeInt(buffer, palette.size());
         palette.forEach(id -> {
-            VarInts.writeUnsignedInt(buffer, id);
+            VarInts.writeInt(buffer, id);
             return true;
         });
     }