From 0d1fedbdbfa0a1968ace97ea0435b630d6c4d31c Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Sun, 24 Apr 2022 13:58:34 -0400
Subject: [PATCH] Fix instances of resizing global biome palettes

Fixes #2744
---
 .../geysermc/geyser/translator/level/BiomeTranslator.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/translator/level/BiomeTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/level/BiomeTranslator.java
index a202c3f81..ac9a0517a 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/level/BiomeTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/level/BiomeTranslator.java
@@ -126,11 +126,10 @@ public class BiomeTranslator {
                 storage = new BlockStorage(bitArray, bedrockPalette);
             } else {
                 storage = new BlockStorage(0);
-                BitArray bitArray = storage.getBitArray();
 
                 // Each section of biome corresponding to a chunk section contains 4 * 4 * 4 entries
                 for (int i = 0; i < 64; i++) {
-                    int javaId = biomeData.getPalette().idToState(biomeData.getStorage().get(i));
+                    int javaId = palette.idToState(biomeData.getStorage().get(i));
                     int x = i & 3;
                     int y = (i >> 4) & 3;
                     int z = (i >> 2) & 3;
@@ -139,7 +138,9 @@ public class BiomeTranslator {
                     int idx = storage.idFor(biomeId);
                     // Convert biome coordinates into block coordinates
                     // Bedrock expects a full 4096 blocks
-                    multiplyIdToStorage(bitArray, idx, x, y, z);
+                    // Implementation note: storage.getBitArray() must be called and not stored - if the palette
+                    // grows, then the instance can change
+                    multiplyIdToStorage(storage.getBitArray(), idx, x, y, z);
                 }
             }
             return storage;