From db1563aa799397224a5fa23b020bb6dd1199d19a Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Thu, 15 Jul 2021 20:51:13 -0400
Subject: [PATCH] Better estimate for new biome data size

---
 .../translators/java/world/JavaChunkDataTranslator.java        | 2 +-
 .../src/main/java/org/geysermc/connector/utils/ChunkUtils.java | 3 ++-
 2 files changed, 3 insertions(+), 2 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 847a58f7e..24b5a8a06 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
@@ -82,7 +82,7 @@ public class JavaChunkDataTranslator extends PacketTranslator<ServerChunkDataPac
                     size += (section != null ? section : session.getBlockMappings().getEmptyChunkSection()).estimateNetworkSize();
                 }
                 if (NEW_BIOME_WRITE) {
-                    size += session.getBlockMappings().getEmptyChunkSection().estimateNetworkSize() * 32;
+                    size += ChunkUtils.EMPTY_CHUNK_DATA.length; // Consists only of biome data
                 } else {
                     size += 256; // Biomes pre-1.18
                 }
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 c4e2162ad..a5a5e1413 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java
@@ -81,7 +81,7 @@ public class ChunkUtils {
     private static final int MAXIMUM_ACCEPTED_HEIGHT = 256;
     private static final int MAXIMUM_ACCEPTED_HEIGHT_OVERWORLD = GeyserConnector.getInstance().getConfig().isExtendedWorldHeight() ? 384 : MAXIMUM_ACCEPTED_HEIGHT;
 
-    private static final byte[] EMPTY_CHUNK_DATA;
+    public static final byte[] EMPTY_CHUNK_DATA;
     public static final byte[] EMPTY_BIOME_DATA;
 
     static {
@@ -105,6 +105,7 @@ public class ChunkUtils {
 
                 EMPTY_CHUNK_DATA = new byte[byteBuf.readableBytes()];
                 byteBuf.readBytes(EMPTY_CHUNK_DATA);
+                System.out.println(EMPTY_CHUNK_DATA.length);
             } finally {
                 byteBuf.release();
             }