Fix reading the wrong block if palette only has one entry

TBlueF · TBlueF · commit faa6965df332 · 2022-10-21T20:18:25.000+02:00
diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil113.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil113.java
@@ -194,6 +194,7 @@ public int getSectionY() {
         }
 
         public BlockState getBlockState(int x, int y, int z) {
+            if (palette.length == 1) return palette[0];
             if (blocks.length == 0) return BlockState.AIR;
 
             x &= 0xF; y &= 0xF; z &= 0xF; // Math.floorMod(pos.getX(), 16)
diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil115.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil115.java
@@ -196,6 +196,7 @@ public int getSectionY() {
         }
 
         public BlockState getBlockState(int x, int y, int z) {
+            if (palette.length == 1) return palette[0];
             if (blocks.length == 0) return BlockState.AIR;
 
             x &= 0xF; y &= 0xF; z &= 0xF; // Math.floorMod(pos.getX(), 16)
diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil116.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil116.java
@@ -230,8 +230,8 @@ public int getSectionY() {
         }
 
         public BlockState getBlockState(int x, int y, int z) {
-            if (blocks.length == 0) return BlockState.AIR;
             if (palette.length == 1) return palette[0];
+            if (blocks.length == 0) return BlockState.AIR;
 
             x &= 0xF; y &= 0xF; z &= 0xF; // Math.floorMod(pos.getX(), 16)
 
diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil118.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil118.java
@@ -231,8 +231,8 @@ public int getSectionY() {
         }
 
         public BlockState getBlockState(int x, int y, int z) {
-            if (blocks.length == 0) return BlockState.AIR;
             if (blockPalette.length == 1) return blockPalette[0];
+            if (blocks.length == 0) return BlockState.AIR;
 
             x &= 0xF; y &= 0xF; z &= 0xF; // Math.floorMod(pos.getX(), 16)
 

Original file line number	Diff line number	Diff line change
`@@ -194,6 +194,7 @@ public int getSectionY() {`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`public BlockState getBlockState(int x, int y, int z) {`
	`197`	`+ if (palette.length == 1) return palette[0];`
`197`	`198`	`if (blocks.length == 0) return BlockState.AIR;`
`198`	`199`
`199`	`200`	`x &= 0xF; y &= 0xF; z &= 0xF; // Math.floorMod(pos.getX(), 16)`
Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,7 @@ public int getSectionY() {`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`public BlockState getBlockState(int x, int y, int z) {`
	`199`	`+ if (palette.length == 1) return palette[0];`
`199`	`200`	`if (blocks.length == 0) return BlockState.AIR;`
`200`	`201`
`201`	`202`	`x &= 0xF; y &= 0xF; z &= 0xF; // Math.floorMod(pos.getX(), 16)`
Original file line number	Diff line number	Diff line change
`@@ -230,8 +230,8 @@ public int getSectionY() {`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`public BlockState getBlockState(int x, int y, int z) {`
`233`		`- if (blocks.length == 0) return BlockState.AIR;`
`234`	`233`	`if (palette.length == 1) return palette[0];`
	`234`	`+ if (blocks.length == 0) return BlockState.AIR;`
`235`	`235`
`236`	`236`	`x &= 0xF; y &= 0xF; z &= 0xF; // Math.floorMod(pos.getX(), 16)`
`237`	`237`
Original file line number	Diff line number	Diff line change
`@@ -231,8 +231,8 @@ public int getSectionY() {`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`public BlockState getBlockState(int x, int y, int z) {`
`234`		`- if (blocks.length == 0) return BlockState.AIR;`
`235`	`234`	`if (blockPalette.length == 1) return blockPalette[0];`
	`235`	`+ if (blocks.length == 0) return BlockState.AIR;`
`236`	`236`
`237`	`237`	`x &= 0xF; y &= 0xF; z &= 0xF; // Math.floorMod(pos.getX(), 16)`
`238`	`238`