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

Return past functionality to canCombine

Browse source
This commit is contained in:
Nicholas Ignoffo 2017-02-20 14:15:41 -08:00
parent 93d7efcb40
commit da1bb01ff0
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -531,8 +531,8 @@ public class Utils
} }
/** /**
* Used to determine if stack1 can be placed into stack2. If stack2 is null * Used to determine if stack1 can be placed into stack2. If stack2 is is empty
* and stack1 isn't null, returns true. Ignores stack size * and stack1 isn't empty, returns true. Ignores stack size
* *
* @param stack1 * @param stack1
* Stack that is placed into a slot * Stack that is placed into a slot
@ -544,18 +544,7 @@ public class Utils
@Deprecated @Deprecated
public static boolean canCombine(ItemStack stack1, ItemStack stack2) public static boolean canCombine(ItemStack stack1, ItemStack stack2)
{ {
return ItemHandlerHelper.canItemStacksStack(stack1, stack2); return stack1.isEmpty() && !stack2.isEmpty() || ItemHandlerHelper.canItemStacksStack(stack1, stack2);
// if (stack1.isEmpty() || stack1.isItemStackDamageable() ^ stack2.isItemStackDamageable())
// {
// return false;
// }
//
// if (stack2.isEmpty())
// {
// return true;
// }
//
// return stack1.getItem() == stack2.getItem() && stack1.getItemDamage() == stack2.getItemDamage() && ItemStack.areItemStackTagsEqual(stack1, stack2);
} }
/** /**