fix: Use default value when block state palette entry is missing (#608)

This mirrors vanilla behavior (see `PalettedContainer.get(index)`). Fixes #565
CaffeineMC · Mar 27, 2021 · 0931c43 · 0931c43
1 parent 7b22520
commit 0931c43
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/main/java/me/jellysquid/mods/sodium/client/world/WorldSlice.java b/src/main/java/me/jellysquid/mods/sodium/client/world/WorldSlice.java
@@ -261,6 +261,9 @@ private void populateBlockArrays(int sectionIdx, ChunkSectionPos pos, Chunk chun
                         state = prevPaletteState;
                     } else {
                         state = palette.getByIndex(paletteId);
+                        if (state == null) {
+                            state = container.defaultValue;
+                        }
 
                         prevPaletteState = state;
                         prevPaletteId = paletteId;

diff --git a/src/main/resources/sodium.accesswidener b/src/main/resources/sodium.accesswidener
@@ -9,3 +9,4 @@ accessible method net/minecraft/client/render/Frustum isVisible (DDDDDD)Z
 
 accessible field net/minecraft/world/chunk/PalettedContainer data Lnet/minecraft/util/collection/PackedIntegerArray;
 accessible field net/minecraft/world/chunk/PalettedContainer palette Lnet/minecraft/world/chunk/Palette;
+accessible field net/minecraft/world/chunk/PalettedContainer defaultValue Ljava/lang/Object;