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

Do not assume biomes are in sequential order

Browse source
This commit is contained in:
Camotoy 2023-04-12 11:03:03 -04:00
parent 98dceee5e3
commit 0521fba1a8
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,13 +34,8 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.IntTag; import com.github.steveice10.opennbt.tag.builtin.IntTag;
import com.github.steveice10.opennbt.tag.builtin.ListTag; import com.github.steveice10.opennbt.tag.builtin.ListTag;
import com.github.steveice10.opennbt.tag.builtin.StringTag; import com.github.steveice10.opennbt.tag.builtin.StringTag;
import it.unimi.dsi.fastutil.ints.Int2IntMap; import it.unimi.dsi.fastutil.ints.*;
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
import it.unimi.dsi.fastutil.ints.IntLists;
import org.geysermc.geyser.level.chunk.BlockStorage; import org.geysermc.geyser.level.chunk.BlockStorage;
import org.geysermc.geyser.level.chunk.GeyserChunkSection;
import org.geysermc.geyser.level.chunk.bitarray.BitArray; import org.geysermc.geyser.level.chunk.bitarray.BitArray;
import org.geysermc.geyser.level.chunk.bitarray.BitArrayVersion; import org.geysermc.geyser.level.chunk.bitarray.BitArrayVersion;
import org.geysermc.geyser.level.chunk.bitarray.SingletonBitArray; import org.geysermc.geyser.level.chunk.bitarray.SingletonBitArray;
@ -59,10 +54,14 @@ public class BiomeTranslator {
ListTag serverBiomes = worldGen.get("value"); ListTag serverBiomes = worldGen.get("value");
session.setBiomeGlobalPalette(MathUtils.getGlobalPaletteForSize(serverBiomes.size())); session.setBiomeGlobalPalette(MathUtils.getGlobalPaletteForSize(serverBiomes.size()));
int greatestBiomeId = 0;
for (CompoundTag biomeTag : JavaCodecUtil.iterateAsTag(worldGen)) { for (CompoundTag biomeTag : JavaCodecUtil.iterateAsTag(worldGen)) {
String javaIdentifier = ((StringTag) biomeTag.get("name")).getValue(); String javaIdentifier = ((StringTag) biomeTag.get("name")).getValue();
int bedrockId = Registries.BIOME_IDENTIFIERS.get().getOrDefault(javaIdentifier, 0); int bedrockId = Registries.BIOME_IDENTIFIERS.get().getOrDefault(javaIdentifier, 0);
int javaId = ((IntTag) biomeTag.get("id")).getValue(); int javaId = ((IntTag) biomeTag.get("id")).getValue();
if (javaId > greatestBiomeId) {
greatestBiomeId = javaId;
}
// TODO - the category tag no longer exists - find a better replacement option // TODO - the category tag no longer exists - find a better replacement option
// if (bedrockId == -1) { // if (bedrockId == -1) {
@ -89,7 +88,7 @@ public class BiomeTranslator {
} }
} }
int[] biomes = new int[biomeTranslations.size()]; int[] biomes = new int[greatestBiomeId + 1];
for (Int2IntMap.Entry entry : biomeTranslations.int2IntEntrySet()) { for (Int2IntMap.Entry entry : biomeTranslations.int2IntEntrySet()) {
biomes[entry.getIntKey()] = entry.getIntValue(); biomes[entry.getIntKey()] = entry.getIntValue();
} }