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

Workaround bizarre 1.17->1.18 chunk lifecycle (Spigot, Fabric, Forge)

Browse source
This commit is contained in:
Mike Primm 2021-12-15 20:40:06 -06:00
parent 3af5ac05e2
commit 28fd746248
4 changed files with 22 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

40
fabric-1.18/src/main/java/org/dynmap/fabric_1_18/FabricMapChunkCache.java
View file

@ -60,30 +60,6 @@ public class FabricMapChunkCache extends GenericMapChunkCache {
super.setChunks(dw, chunks);
}
private NbtCompound readChunk(int x, int z) {
try {
ThreadedAnvilChunkStorage acl = cps.threadedAnvilChunkStorage;
ChunkPos coord = new ChunkPos(x, z);
NbtCompound rslt = acl.getNbt(coord);
if (rslt != null) {
// Don't load uncooked chunks
String stat = rslt.getString("Status");
ChunkStatus cs = ChunkStatus.byId(stat);
if ((stat == null) ||
// Needs to be at least lighted
(!cs.isAtLeast(ChunkStatus.LIGHT))) {
rslt = null;
}
}
//Log.info(String.format("loadChunk(%d,%d)=%s", x, z, (rslt != null) ? rslt.toString() : "null"));
return rslt;
} catch (Exception exc) {
Log.severe(String.format("Error reading chunk: %s,%d,%d", dw.getName(), x, z), exc);
return null;
}
}
private boolean isLitChunk(NbtCompound nbt) {
if ((nbt != null) && nbt.contains("Level")) {
nbt = nbt.getCompound("Level");
@ -91,7 +67,7 @@ public class FabricMapChunkCache extends GenericMapChunkCache {
if (nbt != null) {
String stat = nbt.getString("Status");
ChunkStatus cs = ChunkStatus.byId(stat);
if ((stat != null) && cs.isAtLeast(ChunkStatus.LIGHT)) { // ChunkStatus.LIGHT
if ((stat != null) && (cs.isAtLeast(ChunkStatus.LIGHT) || (cs == ChunkStatus.EMPTY))) { // ChunkStatus.LIGHT OR migrated EMPTY
return true;
}
}
@ -115,7 +91,19 @@ public class FabricMapChunkCache extends GenericMapChunkCache {
}
return gc;
}
private NbtCompound readChunk(int x, int z) {
try {
ThreadedAnvilChunkStorage acl = cps.threadedAnvilChunkStorage;
ChunkPos coord = new ChunkPos(x, z);
return acl.getNbt(coord);
} catch (Exception exc) {
Log.severe(String.format("Error reading chunk: %s,%d,%d", dw.getName(), x, z), exc);
return null;
}
}
// Load generic chunk from unloaded chunk
protected GenericChunk loadChunk(DynmapChunk chunk) {
GenericChunk gc = null;