cleanup some descriptions + optimize hoppers patch

This commit is contained in:
Owen1212055
2023-06-08 14:10:23 -04:00
parent 27c0ed55ea
commit 5c83f1aca3
2 changed files with 1 additions and 5 deletions

View File

@@ -556,7 +556,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
private static boolean canMergeItems(ItemStack first, ItemStack second) {
- return first.getCount() <= first.getMaxStackSize() && ItemStack.isSameItemSameTags(first, second);
+ return first.is(second.getItem()) && first.getDamageValue() == second.getDamageValue() && first.getCount() < first.getMaxStackSize() && ItemStack.isSameItemSameTags(first, second); // Paper - used to return true for full itemstacks?!
+ return first.getCount() < first.getMaxStackSize() && first.is(second.getItem()) && first.getDamageValue() == second.getDamageValue() && ((first.isEmpty() && second.isEmpty()) || java.util.Objects.equals(first.getTag(), second.getTag())); // Paper - used to return true for full itemstacks?!
}
@Override