diff --git a/src/api/java/ic2/api/energy/prefab/BasicEnergyTile.java b/src/api/java/ic2/api/energy/prefab/BasicEnergyTile.java index fc913bafe..624e1077f 100644 --- a/src/api/java/ic2/api/energy/prefab/BasicEnergyTile.java +++ b/src/api/java/ic2/api/energy/prefab/BasicEnergyTile.java @@ -220,7 +220,7 @@ abstract class BasicEnergyTile implements ILocatable, IEnergyTile { * @return true if energy was transferred */ public boolean charge(ItemStack stack) { - if (stack == null || !Info.isIc2Available() || getWorldObj().isRemote) return false; + if (stack == null || stack.isEmpty() || !Info.isIc2Available() || getWorldObj().isRemote) return false; double amount = ElectricItem.manager.charge(stack, energyStored, Math.max(getSinkTier(), getSourceTier()), false, false); @@ -237,7 +237,7 @@ abstract class BasicEnergyTile implements ILocatable, IEnergyTile { * @return true if energy was transferred */ public boolean discharge(ItemStack stack, double limit) { - if (stack == null || !Info.isIc2Available() || getWorldObj().isRemote) return false; + if (stack == null || stack.isEmpty() || !Info.isIc2Available() || getWorldObj().isRemote) return false; double amount = capacity - energyStored; if (amount <= 0) return false; diff --git a/src/main/java/mekanism/client/render/obj/GlowPanelModel.java b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java index 571bb2730..39281fc38 100644 --- a/src/main/java/mekanism/client/render/obj/GlowPanelModel.java +++ b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java @@ -63,7 +63,7 @@ public class GlowPanelModel extends OBJBakedModelBase public EnumColor getColor() { - if(tempStack != null) + if(tempStack != null && !tempStack.isEmpty()) { return EnumColor.DYES[tempStack.getItemDamage()]; } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 112995856..a1406f3bf 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -410,7 +410,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock if(mop != null && mop.sideHit == bin.facing) { - if(bin.bottomStack != null) + if(bin.bottomStack != null && !bin.bottomStack.isEmpty()) { if(!player.isSneaking()) { diff --git a/src/main/java/mekanism/common/recipe/inputs/InfusionInput.java b/src/main/java/mekanism/common/recipe/inputs/InfusionInput.java index e40952e08..ddb6de28d 100644 --- a/src/main/java/mekanism/common/recipe/inputs/InfusionInput.java +++ b/src/main/java/mekanism/common/recipe/inputs/InfusionInput.java @@ -53,7 +53,7 @@ public class InfusionInput extends MachineInput @Override public boolean isValid() { - return infuse.type != null && inputStack != null; + return infuse.type != null && inputStack != null && !inputStack.isEmpty(); } public boolean use(NonNullList inventory, int index, InfuseStorage infuseStorage, boolean deplete)