neocturne/MinedMap
1
0
Fork 0
mirror of https://github.com/neocturne/MinedMap.git synced 2025-07-02 13:59:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

world: fix deserialize of unpopulated 1.18+ sections

Browse source
This commit is contained in:
Matthias Schiffer 2023-08-20 19:11:12 +02:00
parent 42a800e08c
commit 003b48951b
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
2 changed files with 51 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/world/chunk.rs
View file

@ -112,27 +112,36 @@ impl<'a> Chunk<'a> {
let mut section_map = BTreeMap::new();
for section in sections {
section_map.insert(
SectionY(section.y),
(
SectionV1_13::new(
data_version,
section.block_states.data.as_deref(),
&section.block_states.palette,
block_types,
)
.with_context(|| format!("Failed to load section at Y={}", section.y))?,
BiomesV1_18::new(
section.biomes.data.as_deref(),
&section.biomes.palette,
biome_types,
)
.with_context(|| format!("Failed to load section biomes at Y={}", section.y))?,
BlockLight::new(section.block_light.as_deref()).with_context(|| {
format!("Failed to load section block light at Y={}", section.y)
})?,
),
);
match &section.section {
de::SectionV1_18Variants::V1_18 {
block_states,
biomes,
block_light,
} => {
section_map.insert(
SectionY(section.y),
(
SectionV1_13::new(
data_version,
block_states.data.as_deref(),
&block_states.palette,
block_types,
)
.with_context(|| {
format!("Failed to load section at Y={}", section.y)
})?,
BiomesV1_18::new(biomes.data.as_deref(), &biomes.palette, biome_types)
.with_context(|| {
format!("Failed to load section biomes at Y={}", section.y)
})?,
BlockLight::new(block_light.as_deref()).with_context(|| {
format!("Failed to load section block light at Y={}", section.y)
})?,
),
);
}
de::SectionV1_18Variants::Empty {} => {}
};
}
Ok(Chunk::V1_18 { section_map })