lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix crash when checking if stacks can combine (#1053)

Browse source
This commit is contained in:
Nicholas Ignoffo 2017-02-20 14:13:14 -08:00
parent 1fb221c7f0
commit 0d4524cafc
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/WayofTime/bloodmagic/util/Utils.java
View file

@ -46,6 +46,7 @@ import net.minecraftforge.fluids.IFluidBlock;
import net.minecraftforge.fml.common.discovery.ASMDataTable; import net.minecraftforge.fml.common.discovery.ASMDataTable;
import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemHandlerHelper;
import net.minecraftforge.items.wrapper.InvWrapper; import net.minecraftforge.items.wrapper.InvWrapper;
import net.minecraftforge.items.wrapper.SidedInvWrapper; import net.minecraftforge.items.wrapper.SidedInvWrapper;
import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.BloodMagic;
@ -537,19 +538,8 @@ public class Utils
* Slot content that stack1 is placed into * Slot content that stack1 is placed into
* @return True if they can be combined * @return True if they can be combined
*/ */
public static boolean canCombine(ItemStack stack1, ItemStack stack2) public static boolean canCombine(ItemStack stack1, ItemStack stack2) {
{ return stack1 != null && stack2 == null || ItemHandlerHelper.canItemStacksStack(stack1, 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);
} }
/** /**