From 69624715ec8e3e8c52b0b2c72dcfb9bc86943bb8 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" <aidancbrady@aol.com> Date: Tue, 24 Mar 2015 23:19:56 -0400 Subject: [PATCH] Fixed a crash --- src/main/java/mekanism/common/block/BlockMachine.java | 1 - src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 15152ee8c..89ef32be1 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -225,7 +225,6 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer icons[3][3] = register.registerIcon("mekanism:OredictionificatorSide"); break; } - } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 3b27ec253..62d6618c6 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -370,7 +370,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I else { MinerFilter filter = replaceMap.get(index); - if(filter.replaceStack == null || !filter.requireStack) + if(filter == null || (filter.replaceStack == null || !filter.requireStack)) { worldObj.setBlockToAir(obj.xCoord, obj.yCoord, obj.zCoord);