From d97e843f7b3310574b567a55172c039c761e39f3 Mon Sep 17 00:00:00 2001 From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com> Date: Wed, 28 Oct 2020 23:20:48 +0000 Subject: [PATCH] Guard against all possible nulls to be on the safe side, fixes #517 --- .../wizardry/client/model/BakedModelGenerateOverrides.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/electroblob/wizardry/client/model/BakedModelGenerateOverrides.java b/src/main/java/electroblob/wizardry/client/model/BakedModelGenerateOverrides.java index 32d08e4a..a8272917 100644 --- a/src/main/java/electroblob/wizardry/client/model/BakedModelGenerateOverrides.java +++ b/src/main/java/electroblob/wizardry/client/model/BakedModelGenerateOverrides.java @@ -119,7 +119,9 @@ public class BakedModelGenerateOverrides implements IBakedModel { IBakedModel original = event.getModelRegistry().getObject(location); - if(original != null){ + // Ignore the warnings, IntelliJ is right that these can't be null in the dev environment but certain + // mods seem to be doing ASM hackery that makes it so they can be null + if(original != null && original.getOverrides() != null && original.getOverrides().getOverrides() != null){ original.getOverrides().getOverrides().stream().map(ItemOverride::getLocation) .filter(l -> l.getPath().contains(OVERRIDE_GENERATORS)).findFirst() .ifPresent(l -> event.getModelRegistry().putObject(location,