Sulkta-OSS/dynmap-neoforge
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply lighting workaround to 1.16.5+

Browse source
This commit is contained in:
Mike Primm 2021-12-16 12:32:10 -06:00
parent eff72aeef0
commit 69a6bb2a2a
7 changed files with 24 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

18
DynmapCore/src/main/java/org/dynmap/common/chunk/GenericMapChunkCache.java
View file

@ -910,12 +910,16 @@ public abstract class GenericMapChunkCache extends MapChunkCache {
}
if (nbt == null) return null;
String status = nbt.getString("Status");
boolean hasLight = false;
int version = nbt.getInt("DataVersion");
boolean hasLitState = false;
if (status != null) {
for (int i = 0; i < litStates.length; i++) {
if (status.equals(litStates[i])) hasLight = true;
if (status.equals(litStates[i])) { hasLitState = true; }
}
}
boolean hasLight = hasLitState; // Assume good light in a lit state
// Start generic chunk builder
GenericChunk.Builder bld = new GenericChunk.Builder(dw.minY, dw.worldheight);
int x = nbt.getInt("xPos");
@ -958,7 +962,7 @@ public abstract class GenericMapChunkCache extends MapChunkCache {
// Prescan sections to see if lit
for (int i = 0; i < sect.size(); i++) {
GenericNBTCompound sec = sect.getCompound(i);
if (sec.contains("BlockLight") || sec.contains("SkyLight")) {
if (sec.contains("SkyLight")) { // Only consider skylight for now, since that is what we generate if needed
hasLight = true;
}
}
@ -1074,9 +1078,6 @@ public abstract class GenericMapChunkCache extends MapChunkCache {
}
if (sec.contains("SkyLight")) {
sbld.skyLight(sec.getByteArray("SkyLight"));
}
else if (!hasLight) {
sbld.singleSkyLight(15);
}
// If section biome palette
if (sec.contains("biomes")) {
@ -1110,8 +1111,13 @@ public abstract class GenericMapChunkCache extends MapChunkCache {
bld.addSection(secnum, sbld.build());
sbld.reset();
}
// If pre 1.17, assume unlit state means bad light
if ((version < 2724) && (!hasLitState)) {
hasLight = false;
}
// If no light, do simple generate
if (!hasLight) {
Log.info(String.format("generateSky(%d,%d)", x, z));
bld.generateSky();
}
return bld.build();