From 348b1eb92cfbc043575b4ee53f750daa307a22e2 Mon Sep 17 00:00:00 2001 From: Shadows_of_Fire Date: Wed, 6 Dec 2017 16:25:10 -0500 Subject: [PATCH] Better check --- .../misc/apiimpl/farmer/exu/ExUPlantFarmerBehavior.java | 2 +- .../de/ellpeck/actuallyadditions/mod/util/StackUtil.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/exu/ExUPlantFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/exu/ExUPlantFarmerBehavior.java index 469e717a1..6a617a51f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/exu/ExUPlantFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/exu/ExUPlantFarmerBehavior.java @@ -74,7 +74,7 @@ public abstract class ExUPlantFarmerBehavior implements IFarmerBehavior{ if(block.getMetaFromState(state) >= this.getMaxStage()){ NonNullList drops = NonNullList.create(); block.getDrops(drops, world, pos, state, 0); - if(drops.isEmpty()) return FarmerResult.FAIL; + if(StackUtil.isEmpty(drops)) return FarmerResult.FAIL; for(ItemStack stack : drops){ if(StackUtil.isValid(stack)){ ResourceLocation itemReg = stack.getItem().getRegistryName(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/StackUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/StackUtil.java index f2fee0a80..37888d9db 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/StackUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/StackUtil.java @@ -10,6 +10,8 @@ package de.ellpeck.actuallyadditions.mod.util; +import java.util.Collection; + import de.ellpeck.actuallyadditions.api.misc.IDisableableItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -93,6 +95,12 @@ public final class StackUtil{ public static NonNullList createSlots(int size){ return NonNullList.withSize(size, getEmpty()); } + + public static boolean isEmpty(Collection stacks) { + if(stacks.isEmpty()) return true; + else for(ItemStack s : stacks) if (!s.isEmpty()) return false; + return true; + } }