Fix NPE in TierSortingStruct

Signed-off-by: TheSilkMiner <thesilkminer@outlook.com>
CraftTweaker · Aug 1, 2022 · afd8245 · afd8245
1 parent 2f609e0
commit afd8245
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/forge/src/api/java/com/blamejared/contenttweaker/forge/api/zen/rt/TierSortingStruct.java b/forge/src/api/java/com/blamejared/contenttweaker/forge/api/zen/rt/TierSortingStruct.java
@@ -9,6 +9,7 @@
 import org.openzen.zencode.java.ZenCodeType;
 
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
@@ -72,6 +73,9 @@ static TierSortingStruct of(final TierReference tier) {
     }
 
     public Supplier<Object> get() {
-        return () -> Stream.of(this.rl, this.name, this.tier.get()).filter(Objects::nonNull).findFirst().orElseGet(Object::new);
+        return () -> Stream.of(this.rl, this.name, Optional.ofNullable(this.tier).map(TierReference::get).orElse(null))
+                .filter(Objects::nonNull)
+                .findFirst()
+                .orElseGet(Object::new);
     }
 }