Skip to content

[resource loader] fix NPE when reloading texture packs in b1.8-pre1- #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SpaceWalkerRS wants to merge 1 commit into
base: gen2
Choose a base branch
from
Open

[resource loader] fix NPE when reloading texture packs in b1.8-pre1- #116

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...2.5/src/main/java/net/ornithemc/osl/resource/loader/impl/mixin/client/MinecraftMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -28,6 +29,8 @@ public class MinecraftMixin implements MinecraftExtension {
private TextureManager textureManager;
@Shadow
private WorldRenderer worldRenderer;
@Shadow
private World world;

@Unique
private SimpleResourcePackRepository packRepository;
Expand Down Expand Up @@ -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();
}
}
Expand Down
Loading