diff --git a/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java b/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java index f0df1cb2b93..a5365011a6a 100644 --- a/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java +++ b/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java @@ -5,6 +5,8 @@ import java.util.Collections; import java.util.List; +import javax.annotation.Nonnull; + import net.minecraft.item.ItemStack; public class ArrayUtils { @@ -21,13 +23,13 @@ public static V[] insertElementAtIndex(V[] aArray, int aIndex, V aObjectToIn return newArray; } - public static Object[] removeNulls(final Object[] v) { + public static Object[] removeNulls(@Nonnull final Object[] v) { List list = new ArrayList<>(Arrays.asList(v)); list.removeAll(Collections.singleton(null)); return list.toArray(new Object[0]); } - public static ItemStack[] removeNulls(final ItemStack[] v) { + public static ItemStack[] removeNulls(@Nonnull final ItemStack[] v) { List list = new ArrayList<>(Arrays.asList(v)); list.removeAll(Collections.singleton((ItemStack) null)); return list.toArray(new ItemStack[0]); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java index 3e6d1f397d9..d98e53e2da4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java @@ -222,6 +222,10 @@ protected boolean filtersFluid() { setModeFromInputStacks(tItemInputs); ItemStack[] mFishOutput = generateLoot(); + if (mFishOutput == null) { + return CheckRecipeResultRegistry.NO_RECIPE; + } + mFishOutput = removeNulls(mFishOutput); GTRecipe g = new GTRecipe( true,