From c52d41383f8dbc22334f173d475d51e026fd36d8 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Sun, 22 Mar 2015 22:52:37 -0400 Subject: [PATCH] Fixed a few crashes --- src/main/java/mekanism/common/FluidNetwork.java | 2 +- src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index 10dce1d6c..af752fd6a 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -327,7 +327,7 @@ public class FluidNetwork extends DynamicNetwork for(ForgeDirection side : sides) { - if(acceptor.canFill(side.getOpposite(), fluidToSend.getFluid())) + if(acceptor != null && acceptor.canFill(side.getOpposite(), fluidToSend.getFluid())) { toReturn.add(acceptor); break; diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 8157cc578..3b27ec253 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -387,7 +387,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I { MinerFilter filter = replaceMap.get(index); - if(filter.replaceStack == null) + if(filter == null || filter.replaceStack == null) { return null; }