Upstream
/
Minestom
mirror of https://github.com/Minestom/Minestom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: anvil not loading locations properly

This commit is contained in:
mworzala 2024-04-23 14:29:21 -04:00
parent 38f6fd4434
commit f194736e38
No known key found for this signature in database
GPG Key ID: B148F922E64797C7
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/net/minestom/server/instance/anvil/AnvilLoader.java
View File

@ -14,7 +14,6 @@ import net.minestom.server.utils.NamespaceID;
import net.minestom.server.utils.async.AsyncUtils;
import net.minestom.server.utils.chunk.ChunkUtils;
import net.minestom.server.utils.validate.Check;
import net.minestom.server.world.DimensionType;
import net.minestom.server.world.biomes.Biome;
import net.minestom.server.world.biomes.BiomeManager;
import org.jetbrains.annotations.NotNull;
@ -102,21 +101,12 @@ public class AnvilLoader implements IChunkLoader {
if (chunkData == null)
return CompletableFuture.completedFuture(null);
// Ensure the chunk matches the expected Y range
DimensionType dimensionType = instance.getDimensionType();
int minY = chunkData.getInt("yPos") * Chunk.CHUNK_SECTION_SIZE;
Check.stateCondition(minY != dimensionType.getMinY(), "Trying to load chunk with minY = {0}, but instance dimension type ({1}) has a minY of {2}",
minY, dimensionType.getName().asString(), dimensionType.getMinY());
int maxY = minY + (chunkData.getList("sections", BinaryTagTypes.COMPOUND).size() * Chunk.CHUNK_SECTION_SIZE);
Check.stateCondition(maxY != dimensionType.getMaxY(), "Trying to load chunk with maxY = {0}, but instance dimension type ({1}) has a maxY of {2}",
maxY, dimensionType.getName().asString(), dimensionType.getMaxY());
// Load the chunk data (assuming it is fully generated)
final Chunk chunk = instance.getChunkSupplier().createChunk(instance, chunkX, chunkZ);
synchronized (chunk) { // todo: boo, synchronized
final String status = chunkData.getString("status");
// TODO: Should we handle other states?
// TODO: Should we handle other statuses?
if (status.isEmpty() || "minecraft:full".equals(status)) {
// TODO: Parallelize block, block entities and biome loading
// Blocks + Biomes
@ -172,6 +162,11 @@ public class AnvilLoader implements IChunkLoader {
Check.stateCondition(sectionY == Integer.MIN_VALUE, "Missing section Y value");
final int yOffset = Chunk.CHUNK_SECTION_SIZE * sectionY;
if (sectionY < chunk.getMinSection() || sectionY >= chunk.getMaxSection()) {
// Vanilla stores a section below and above the world for lighting, throw it out.
continue;
}
final Section section = chunk.getSection(sectionY);
// Lighting

4
src/main/java/net/minestom/server/instance/anvil/RegionFile.java
View File

@ -204,8 +204,8 @@ final class RegionFile implements AutoCloseable {
}
private void markLocation(int location, boolean free) {
int sectorCount = locations[location] & 0xFF;
int sectorStart = locations[location] >> 8;
int sectorCount = location & 0xFF;
int sectorStart = location >> 8;
Check.stateCondition(sectorStart + sectorCount > freeSectors.size(), "Invalid sector count");
for (int i = sectorStart; i < sectorStart + sectorCount; i++) {
freeSectors.set(i, free);

1
src/test/java/net/minestom/server/instance/AnvilLoaderIntegrationTest.java
View File

@ -51,7 +51,6 @@ public class AnvilLoaderIntegrationTest {
@Test
public void loadHouse(Env env) {
assumeTrue(false);
// load a world that contains only a basic house and make sure it is loaded properly
AnvilLoader chunkLoader = new AnvilLoader(worldFolder) {