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

Fix handling of single block state sections (zero bit palette)

Browse source
This commit is contained in:
Mike Primm 2021-12-14 23:58:01 -06:00
parent e224757fc0
commit 8dbf972238
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -903,7 +903,9 @@ public abstract class GenericMapChunkCache extends MapChunkCache {
if (nbt == null) return null; if (nbt == null) return null;
// Start generic chunk builder // Start generic chunk builder
GenericChunk.Builder bld = new GenericChunk.Builder(dw.minY, dw.worldheight); GenericChunk.Builder bld = new GenericChunk.Builder(dw.minY, dw.worldheight);
bld.coords(nbt.getInt("xPos"), nbt.getInt("zPos")); int x = nbt.getInt("xPos");
int z = nbt.getInt("zPos");
bld.coords(x, z);
if (nbt.contains("InhabitedTime")) { if (nbt.contains("InhabitedTime")) {
bld.inhabitedTicks(nbt.getLong("InhabitedTime")); bld.inhabitedTicks(nbt.getLong("InhabitedTime"));
} }
@ -972,7 +974,7 @@ public abstract class GenericMapChunkCache extends MapChunkCache {
DataBitsPacked dbp = null; DataBitsPacked dbp = null;
try { try {
db = nbt.makeBitStorage(bitsperblock, 4096, statelist); db = nbt.makeBitStorage(bitsperblock, 4096, statelist);
} catch (Exception x) { // Handle legacy encoded } catch (Exception ex) { // Handle legacy encoded
bitsperblock = (statelist.length * 64) / 4096; bitsperblock = (statelist.length * 64) / 4096;
dbp = new DataBitsPacked(bitsperblock, 4096, statelist); dbp = new DataBitsPacked(bitsperblock, 4096, statelist);
} }
@ -990,12 +992,12 @@ public abstract class GenericMapChunkCache extends MapChunkCache {
} }
} }
} }
else if (sec.contains("block_states")) { // 1.18 else if (sec.contains("block_states", GenericNBTCompound.TAG_COMPOUND)) { // 1.18
GenericNBTCompound block_states = sec.getCompound("block_states"); GenericNBTCompound block_states = sec.getCompound("block_states");
// If we've block state data, process non-empty section // If we've got palette, process non-empty section
if (block_states.contains("data", 12)) { if (block_states.contains("palette", GenericNBTCompound.TAG_LIST)) {
long[] statelist = block_states.getLongArray("data"); long[] statelist = block_states.contains("data", GenericNBTCompound.TAG_LONG_ARRAY) ? block_states.getLongArray("data") : new long[4096 / 64]; // Handle zero bit palette (all same)
GenericNBTList plist = block_states.getList("palette", 10); GenericNBTList plist = block_states.getList("palette", GenericNBTCompound.TAG_COMPOUND);
palette = new DynmapBlockState[plist.size()]; palette = new DynmapBlockState[plist.size()];
for (int pi = 0; pi < plist.size(); pi++) { for (int pi = 0; pi < plist.size(); pi++) {
GenericNBTCompound tc = plist.getCompound(pi); GenericNBTCompound tc = plist.getCompound(pi);