From dfd18d64c29be4fe972a523ca76633bda61bef1b Mon Sep 17 00:00:00 2001 From: Matsv Date: Wed, 18 Jul 2018 23:39:23 +0200 Subject: [PATCH] Correct directPallette check (Thanks @Pokechu22) --- .../protocol1_13to1_12_2/chunks/ChunkSection1_13.java | 4 ++-- .../protocol1_9_1_2to1_9_3_4/chunks/ChunkSection1_9_3_4.java | 2 +- .../protocol1_9_3to1_9_1_2/chunks/ChunkSection1_9_1_2.java | 2 +- .../protocol1_9to1_8/chunks/ChunkSection1_9to1_8.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/chunks/ChunkSection1_13.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/chunks/ChunkSection1_13.java index 0cf10ca41..736b6891f 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/chunks/ChunkSection1_13.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/chunks/ChunkSection1_13.java @@ -123,7 +123,7 @@ public class ChunkSection1_13 implements ChunkSection { if (bitsPerBlock < 4) { bitsPerBlock = 4; } - if (bitsPerBlock > 9) { + if (bitsPerBlock >= 9) { directPalette = true; bitsPerBlock = 14; } @@ -234,7 +234,7 @@ public class ChunkSection1_13 implements ChunkSection { bitsPerBlock++; } boolean directPalette = false; - if (bitsPerBlock > 9) { + if (bitsPerBlock >= 9) { bitsPerBlock = 14; directPalette = true; } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/ChunkSection1_9_3_4.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/ChunkSection1_9_3_4.java index ca4b45d6d..93e5bd0a6 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/ChunkSection1_9_3_4.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1_2to1_9_3_4/chunks/ChunkSection1_9_3_4.java @@ -257,7 +257,7 @@ public class ChunkSection1_9_3_4 implements ChunkSection { bitsPerBlock++; } boolean directPalette = false; - if (bitsPerBlock > 9) { + if (bitsPerBlock >= 9) { bitsPerBlock = 14; directPalette = true; } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/ChunkSection1_9_1_2.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/ChunkSection1_9_1_2.java index 45131c509..03bede471 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/ChunkSection1_9_1_2.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/chunks/ChunkSection1_9_1_2.java @@ -249,7 +249,7 @@ public class ChunkSection1_9_1_2 implements ChunkSection { bitsPerBlock++; } boolean directPalette = false; - if (bitsPerBlock > 9) { + if (bitsPerBlock >= 9) { bitsPerBlock = 14; directPalette = true; } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/chunks/ChunkSection1_9to1_8.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/chunks/ChunkSection1_9to1_8.java index 9033929ab..77ed52c0a 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/chunks/ChunkSection1_9to1_8.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/chunks/ChunkSection1_9to1_8.java @@ -156,7 +156,7 @@ public class ChunkSection1_9to1_8 implements ChunkSection { bitsPerBlock++; } boolean directPalette = false; - if (bitsPerBlock > 9) { + if (bitsPerBlock >= 9) { bitsPerBlock = 14; directPalette = true; }