Fix an NPE

calmilamsy · calmilamsy · commit 27e285d7a7b6 · 2024-08-08T16:53:27.000+01:00
diff --git a/station-recipes-v0/src/main/java/net/modificationstation/stationapi/impl/recipe/StationShapedRecipe.java b/station-recipes-v0/src/main/java/net/modificationstation/stationapi/impl/recipe/StationShapedRecipe.java
@@ -105,6 +105,6 @@ public ItemStack[] getOutputs() {
 
     public Either<TagKey<Item>, ItemStack>[] getGrid() {
         //noinspection unchecked
-        return (Either<TagKey<Item>, ItemStack>[]) Arrays.stream(grid).map(entry -> entry.mapRight(ItemStack::copy)).toArray(Either[]::new);
+        return (Either<TagKey<Item>, ItemStack>[]) Arrays.stream(grid).map(entry -> entry == null ? null : entry.mapRight(ItemStack::copy)).toArray(Either[]::new);
     }
 }
diff --git a/station-recipes-v0/src/main/java/net/modificationstation/stationapi/impl/recipe/StationShapelessRecipe.java b/station-recipes-v0/src/main/java/net/modificationstation/stationapi/impl/recipe/StationShapelessRecipe.java
@@ -97,6 +97,6 @@ public ItemStack[] getOutputs() {
     @Deprecated
     public Either<TagKey<Item>, ItemStack>[] getInputs() {
         //noinspection unchecked
-        return (Either<TagKey<Item>, ItemStack>[]) Arrays.stream(ingredients).map(entry -> entry.mapRight(ItemStack::copy)).toArray(Either[]::new);
+        return (Either<TagKey<Item>, ItemStack>[]) Arrays.stream(ingredients).map(entry -> entry == null ? null : entry.mapRight(ItemStack::copy)).toArray(Either[]::new);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,6 @@ public ItemStack[] getOutputs() {`
`105`	`105`
`106`	`106`	`public Either<TagKey<Item>, ItemStack>[] getGrid() {`
`107`	`107`	`//noinspection unchecked`
`108`		`- return (Either<TagKey<Item>, ItemStack>[]) Arrays.stream(grid).map(entry -> entry.mapRight(ItemStack::copy)).toArray(Either[]::new);`
	`108`	`+ return (Either<TagKey<Item>, ItemStack>[]) Arrays.stream(grid).map(entry -> entry == null ? null : entry.mapRight(ItemStack::copy)).toArray(Either[]::new);`
`109`	`109`	`}`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,6 @@ public ItemStack[] getOutputs() {`
`97`	`97`	`@Deprecated`
`98`	`98`	`public Either<TagKey<Item>, ItemStack>[] getInputs() {`
`99`	`99`	`//noinspection unchecked`
`100`		`- return (Either<TagKey<Item>, ItemStack>[]) Arrays.stream(ingredients).map(entry -> entry.mapRight(ItemStack::copy)).toArray(Either[]::new);`
	`100`	`+ return (Either<TagKey<Item>, ItemStack>[]) Arrays.stream(ingredients).map(entry -> entry == null ? null : entry.mapRight(ItemStack::copy)).toArray(Either[]::new);`
`101`	`101`	`}`
`102`	`102`	`}`