From 022a0318298f5e27a7b6d6695c6feee004c77fc5 Mon Sep 17 00:00:00 2001 From: Michael Primm Date: Sun, 16 Apr 2023 23:53:45 -0500 Subject: [PATCH] Fix >8 bit palette handling --- .../common/chunk/GenericMapChunkCache.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/DynmapCore/src/main/java/org/dynmap/common/chunk/GenericMapChunkCache.java b/DynmapCore/src/main/java/org/dynmap/common/chunk/GenericMapChunkCache.java index 1cbccee5..484b38ac 100644 --- a/DynmapCore/src/main/java/org/dynmap/common/chunk/GenericMapChunkCache.java +++ b/DynmapCore/src/main/java/org/dynmap/common/chunk/GenericMapChunkCache.java @@ -1295,19 +1295,19 @@ public abstract class GenericMapChunkCache extends MapChunkCache { bitsperblock = (statelist.length * 64) / 4096; dbp = new DataBitsPacked(bitsperblock, 4096, statelist); } - if (bitsperblock > 8) { // Not palette - for (int j = 0; j < 4096; j++) { - int v = db != null ? db.get(j) : dbp.getAt(j); - sbld.xyzBlockState(j & 0xF, (j & 0xF00) >> 8, (j & 0xF0) >> 4, DynmapBlockState.getStateByGlobalIndex(v)); - } - } - else { + //if (bitsperblock > 8) { // Not palette + // for (int j = 0; j < 4096; j++) { + // int v = db != null ? db.get(j) : dbp.getAt(j); + // sbld.xyzBlockState(j & 0xF, (j & 0xF00) >> 8, (j & 0xF0) >> 4, DynmapBlockState.getStateByGlobalIndex(v)); + // } + //} + //else { sbld.xyzBlockStatePalette(palette); // Set palette for (int j = 0; j < 4096; j++) { int v = db != null ? db.get(j) : dbp.getAt(j); sbld.xyzBlockStateInPalette(j & 0xF, (j & 0xF00) >> 8, (j & 0xF0) >> 4, (short)v); } - } + //} } } if (sec.contains("BlockLight")) {