Merge remote-tracking branch 'origin/1.15' into 1.15

This commit is contained in:
modmuss50 2020-01-12 18:40:30 +00:00
commit 7e6f0d1906
4 changed files with 66 additions and 44 deletions

View file

@ -384,7 +384,7 @@ public class StorageUnitBaseBlockEntity extends MachineBaseBlockEntity
@Override
public boolean isValidInvStack(int slot, ItemStack stack) {
if (slot == INPUT_SLOT && !storeItemStack.isEmpty() && !ItemUtils.isItemEqual(stack, storeItemStack, true, false)) {
if (slot == INPUT_SLOT && !(isEmpty() || isSameType(stack))) {
return false;
}
return super.isValidInvStack(slot, stack);