From 41243097f3e95b1d0e98f4c816bd64e398ba30d4 Mon Sep 17 00:00:00 2001
From: Wilhelm Schuster <dev@rot13.io>
Date: Sun, 24 Nov 2024 01:01:38 +0100
Subject: Fix crash in Fishing Port when no recipe is found (#3547)

Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com>
---
 src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java             | 6 ++++--
 .../machines/multi/production/MTEIndustrialFishingPond.java         | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java b/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java
index f0df1cb2b9..a5365011a6 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.Arrays;
 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 class ArrayUtils {
         return newArray;
     }
 
-    public static Object[] removeNulls(final Object[] v) {
+    public static Object[] removeNulls(@Nonnull final Object[] v) {
         List<Object> 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<ItemStack> 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 3e6d1f397d..d98e53e2da 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 @@ public class MTEIndustrialFishingPond extends GTPPMultiBlockBase<MTEIndustrialFi
         setModeFromInputStacks(tItemInputs);
 
         ItemStack[] mFishOutput = generateLoot();
+        if (mFishOutput == null) {
+            return CheckRecipeResultRegistry.NO_RECIPE;
+        }
+
         mFishOutput = removeNulls(mFishOutput);
         GTRecipe g = new GTRecipe(
             true,
-- 
cgit