From 0d4524cafc53bee634f62b254f657b656abcb57a Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Mon, 20 Feb 2017 14:13:14 -0800 Subject: [PATCH] Fix crash when checking if stacks can combine (#1053) --- .../java/WayofTime/bloodmagic/util/Utils.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index 4dece72e..c0a2e72c 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -46,6 +46,7 @@ import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fml.common.discovery.ASMDataTable; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.wrapper.InvWrapper; import net.minecraftforge.items.wrapper.SidedInvWrapper; import WayofTime.bloodmagic.BloodMagic; @@ -537,19 +538,8 @@ public class Utils * Slot content that stack1 is placed into * @return True if they can be combined */ - public static boolean canCombine(ItemStack stack1, ItemStack stack2) - { - if (stack1 == null || stack1.isItemStackDamageable() ^ stack2.isItemStackDamageable()) - { - return false; - } - - if (stack2 == null) - { - return true; - } - - return stack1.getItem() == stack2.getItem() && stack1.getItemDamage() == stack2.getItemDamage() && ItemStack.areItemStackTagsEqual(stack1, stack2); + public static boolean canCombine(ItemStack stack1, ItemStack stack2) { + return stack1 != null && stack2 == null || ItemHandlerHelper.canItemStacksStack(stack1, stack2); } /**