Skip to content

Commit 76ebe60

Browse files
committed
Merge branch 'master' into mc1.20
2 parents 7d38f5e + 77ca01c commit 76ebe60

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

common/src/main/java/de/bluecolored/bluemap/common/rendermanager/WorldRegionRenderTask.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ private BoundsSituation checkTileBounds(Vector2i tile) {
329329
}
330330

331331
private @Nullable TileState checkTileRenderPreconditions(Vector2i tile) {
332+
boolean chunksAreGenerated = false;
332333
boolean chunksAreInhabited = false;
333334

334335
long minInhabitedTime = map.getMapSettings().getMinInhabitedTime();
@@ -344,12 +345,17 @@ private BoundsSituation checkTileBounds(Vector2i tile) {
344345
for (int chunkZ = minZ; chunkZ <= maxZ; chunkZ++) {
345346
Chunk chunk = map.getWorld().getChunk(chunkX, chunkZ);
346347
if (chunk == Chunk.ERRORED_CHUNK) return TileState.CHUNK_ERROR;
347-
if (!chunk.isGenerated()) return TileState.NOT_GENERATED;
348-
if (requireLight && !chunk.hasLightData()) return TileState.MISSING_LIGHT;
348+
if (requireLight) {
349+
if (!chunk.isGenerated()) return TileState.NOT_GENERATED;
350+
if (!chunk.hasLightData()) return TileState.MISSING_LIGHT;
351+
}
352+
if (chunk.isGenerated()) chunksAreGenerated = true;
349353
if (chunk.getInhabitedTime() >= minInhabitedTime) chunksAreInhabited = true;
350354
}
351355
}
352356

357+
if (!chunksAreGenerated) return TileState.NOT_GENERATED;
358+
353359
// second pass for increased inhabited-time-radius
354360
if (!chunksAreInhabited && minInhabitedTimeRadius > 0) {
355361
inhabitedRadiusCheck:

0 commit comments

Comments
 (0)