From 3b0814e8531ed70308a1ac3fa7f9597c14df60b1 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Sat, 6 Aug 2022 17:48:27 -0500
Subject: [PATCH] Adjust biome mapping to handle pathological biome counts per
 segment

---
 .../java/org/dynmap/common/chunk/GenericMapChunkCache.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/DynmapCore/src/main/java/org/dynmap/common/chunk/GenericMapChunkCache.java b/DynmapCore/src/main/java/org/dynmap/common/chunk/GenericMapChunkCache.java
index a43c9198..18aaaad6 100644
--- a/DynmapCore/src/main/java/org/dynmap/common/chunk/GenericMapChunkCache.java
+++ b/DynmapCore/src/main/java/org/dynmap/common/chunk/GenericMapChunkCache.java
@@ -1304,8 +1304,10 @@ public abstract class GenericMapChunkCache extends MapChunkCache {
                 long[] bdataPacked = nbtbiomes.getLongArray("data");
                 GenericNBTList bpalette = nbtbiomes.getList("palette", 8);
                 GenericBitStorage bdata = null;
-                if (bdataPacked.length > 0)
-                    bdata = nbt.makeBitStorage(bdataPacked.length, 64, bdataPacked);
+                if (bdataPacked.length > 0) {
+                	int valsPerLong = (64 / bdataPacked.length);
+                    bdata = nbt.makeBitStorage((64 + valsPerLong - 1) / valsPerLong, 64, bdataPacked);
+                }
                 for (int j = 0; j < 64; j++) {
                     int b = bdata != null ? bdata.get(j) : 0;
                     sbld.xyzBiome(j & 0x3, (j & 0x30) >> 4, (j & 0xC) >> 2, BiomeMap.byBiomeResourceLocation(bpalette.getString(b)));