From a7e02d584a8aa518e94067f9db2f5a40d6814cd6 Mon Sep 17 00:00:00 2001 From: Wilhelm Schuster Date: Sun, 10 Nov 2024 20:10:52 +0100 Subject: [PATCH] Fix NPE making gold casts while they are disabled (#132) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../tconstruct/library/crafting/CastingRecipe.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/tconstruct/library/crafting/CastingRecipe.java b/src/main/java/tconstruct/library/crafting/CastingRecipe.java index b071b92f..65501b82 100644 --- a/src/main/java/tconstruct/library/crafting/CastingRecipe.java +++ b/src/main/java/tconstruct/library/crafting/CastingRecipe.java @@ -1,5 +1,7 @@ package tconstruct.library.crafting; +import javax.annotation.Nullable; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; @@ -32,14 +34,15 @@ public class CastingRecipe { this(replacement, metal, cast, consume, delay, props, false); } - public boolean matches(FluidStack metal, ItemStack inputCast) { - if (castingMetal.isFluidEqual(metal)) { - if (cast != null && cast.getItemDamage() == OreDictionary.WILDCARD_VALUE + public boolean matches(@Nullable FluidStack metal, @Nullable ItemStack inputCast) { + if (metal != null && castingMetal.isFluidEqual(metal)) { + if (inputCast != null && cast != null + && cast.getItemDamage() == OreDictionary.WILDCARD_VALUE && inputCast.getItem() == cast.getItem()) { return true; } else if (!ignoreNBT && ItemStack.areItemStacksEqual(cast, inputCast)) { return true; - } else return ignoreNBT && cast != null && inputCast != null && cast.isItemEqual(inputCast); + } else return ignoreNBT && inputCast != null && cast != null && cast.isItemEqual(inputCast); } return false; }