From ee867e972f0e625eecb26bbdd371877c2e550359 Mon Sep 17 00:00:00 2001 From: coolGi Date: Fri, 3 Nov 2023 23:02:43 +1030 Subject: [PATCH] Fix for when there is a chance of mc being null --- .../distanthorizons/fabric/mixins/client/MixinLightmap.java | 5 ++++- .../distanthorizons/forge/mixins/client/MixinLightmap.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLightmap.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLightmap.java index ca6b1d90e..e24d87767 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLightmap.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLightmap.java @@ -28,7 +28,10 @@ public class MixinLightmap { // since the light map is always updated on the client render thread we should be able to access the client level at the same time IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class); - if (mc.getWrappedClientLevel() == null) + if ( + mc != null && + mc.getWrappedClientLevel() == null + ) return; IClientLevelWrapper clientLevel = mc.getWrappedClientLevel(); diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLightmap.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLightmap.java index 6bd666c41..6b11ebc1a 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLightmap.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLightmap.java @@ -28,7 +28,10 @@ public class MixinLightmap { // since the light map is always updated on the client render thread we should be able to access the client level at the same time IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class); - if (mc.getWrappedClientLevel() == null) + if ( + mc != null && + mc.getWrappedClientLevel() == null + ) return; IClientLevelWrapper clientLevel = mc.getWrappedClientLevel();