From 1d3421f95cdef17ca0c921177dcfcb3982446c2c Mon Sep 17 00:00:00 2001 From: Space Walker Date: Sun, 15 Nov 2026 15:53:53 +0100 Subject: [PATCH] [resource loader] fix NPE when reloading texture packs in b1.8-pre1- --- .../resource/loader/impl/mixin/client/MinecraftMixin.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/resource-loader/resource-loader-mca1.2.2-mc1.2.5/src/main/java/net/ornithemc/osl/resource/loader/impl/mixin/client/MinecraftMixin.java b/libraries/resource-loader/resource-loader-mca1.2.2-mc1.2.5/src/main/java/net/ornithemc/osl/resource/loader/impl/mixin/client/MinecraftMixin.java index 79fed62c7..b97ff1f5f 100644 --- a/libraries/resource-loader/resource-loader-mca1.2.2-mc1.2.5/src/main/java/net/ornithemc/osl/resource/loader/impl/mixin/client/MinecraftMixin.java +++ b/libraries/resource-loader/resource-loader-mca1.2.2-mc1.2.5/src/main/java/net/ornithemc/osl/resource/loader/impl/mixin/client/MinecraftMixin.java @@ -13,6 +13,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.render.texture.TextureManager; import net.minecraft.client.render.world.WorldRenderer; +import net.minecraft.world.World; import net.ornithemc.osl.resource.loader.api.client.MinecraftExtension; import net.ornithemc.osl.resource.loader.api.client.resource.reload.AssetsReloaders; @@ -28,6 +29,8 @@ public class MinecraftMixin implements MinecraftExtension { private TextureManager textureManager; @Shadow private WorldRenderer worldRenderer; + @Shadow + private World world; @Unique private SimpleResourcePackRepository packRepository; @@ -105,7 +108,7 @@ public void reloadResources() { ResourceLoader.LOGGER.warn("Error while reloading resources", e); } - if (this.worldRenderer != null) { + if (this.worldRenderer != null && this.world != null) { this.worldRenderer.reload(); } }