From 329dbe95851b303e2e1409dc0a2c47a0c9e56047 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 2 May 2026 10:43:41 -0500 Subject: [PATCH] Fix block wrapper null pointer --- .../common/wrappers/block/BlockStateWrapper.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java index f55fda2e6..f20398970 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java @@ -1026,7 +1026,11 @@ public class BlockStateWrapper implements IBlockStateWrapper // put if absent in case two threads deserialize at the same time // unfortunately we can't put everything in a computeIfAbsent() since we also throw exceptions WRAPPER_BY_RESOURCE_LOCATION.putIfAbsent(finalResourceStateString, foundWrapper); - WRAPPER_BY_BLOCK_STATE.putIfAbsent(foundWrapper.blockState, foundWrapper); + + if (foundWrapper != AIR) + { + WRAPPER_BY_BLOCK_STATE.putIfAbsent(foundWrapper.blockState, foundWrapper); + } } }