fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Guard against all possible nulls to be on the safe side, fixes #517

Browse Source
This commit is contained in:
Electroblob77
2020-10-28 23:20:48 +00:00
parent 15a153fe11
commit d97e843f7b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/client/model/BakedModelGenerateOverrides.java
+3 -1
View File
@@ -119,7 +119,9 @@ public class BakedModelGenerateOverrides implements IBakedModel {
IBakedModel original = event.getModelRegistry().getObject(location); 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) original.getOverrides().getOverrides().stream().map(ItemOverride::getLocation)
.filter(l -> l.getPath().contains(OVERRIDE_GENERATORS)).findFirst() .filter(l -> l.getPath().contains(OVERRIDE_GENERATORS)).findFirst()
.ifPresent(l -> event.getModelRegistry().putObject(location, .ifPresent(l -> event.getModelRegistry().putObject(location,