From 90accf01db946842ca8b1dbce6df2a17c0866bdc Mon Sep 17 00:00:00 2001 From: James Seibel Date: Wed, 23 Aug 2023 22:00:13 -0500 Subject: [PATCH] Fix a null pointer --- .../common/wrappers/block/BlockStateWrapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 6e2d03653..ed142e156 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 @@ -177,7 +177,7 @@ public class BlockStateWrapper implements IBlockStateWrapper #if MC_1_18_2 || MC_1_19_2 || MC_1_20_1 // use the given level if possible, otherwise try using the currently loaded one Level level = (levelWrapper != null ? (Level)levelWrapper.getWrappedMcObject() : null); - level = (level == null ? Minecraft.getInstance().level : null); + level = (level == null ? Minecraft.getInstance().level : level); #endif ResourceLocation resourceLocation; @@ -241,7 +241,7 @@ public class BlockStateWrapper implements IBlockStateWrapper #if MC_1_18_2 || MC_1_19_2 || MC_1_20_1 // use the given level if possible, otherwise try using the currently loaded one Level level = (levelWrapper != null ? (Level)levelWrapper.getWrappedMcObject() : null); - level = (level == null ? Minecraft.getInstance().level : null); + level = (level == null ? Minecraft.getInstance().level : level); #endif Block block;