GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Fix instances of resizing global biome palettes

Browse source 
Fixes #2744
This commit is contained in:
Camotoy 2022-04-24 13:58:34 -04:00
parent 9bf3334cb0
commit 0d1fedbdbf
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/src/main/java/org/geysermc/geyser/translator/level/BiomeTranslator.java
View file

@ -126,11 +126,10 @@ public class BiomeTranslator {
storage = new BlockStorage(bitArray, bedrockPalette); storage = new BlockStorage(bitArray, bedrockPalette);
} else { } else {
storage = new BlockStorage(0); storage = new BlockStorage(0);
BitArray bitArray = storage.getBitArray();
// Each section of biome corresponding to a chunk section contains 4 * 4 * 4 entries // Each section of biome corresponding to a chunk section contains 4 * 4 * 4 entries
for (int i = 0; i < 64; i++) { 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 x = i & 3;
int y = (i >> 4) & 3; int y = (i >> 4) & 3;
int z = (i >> 2) & 3; int z = (i >> 2) & 3;
@ -139,7 +138,9 @@ public class BiomeTranslator {
int idx = storage.idFor(biomeId); int idx = storage.idFor(biomeId);
// Convert biome coordinates into block coordinates // Convert biome coordinates into block coordinates
// Bedrock expects a full 4096 blocks // 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; return storage;