lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed NPE in Fluid Filter (#1139)

Browse source 
(cherry picked from commit 9a7db20)
This commit is contained in:
Nicholas Ignoffo 2017-05-23 18:41:24 -07:00
parent e9ce88fc73
commit 38e54a4e2f
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/WayofTime/bloodmagic/routing/RoutingFluidFilter.java
View file

@ -13,6 +13,8 @@ import net.minecraftforge.fluids.FluidUtil;
import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.fluids.capability.IFluidTankProperties; import net.minecraftforge.fluids.capability.IFluidTankProperties;
import javax.annotation.Nullable;
public class RoutingFluidFilter implements IFluidFilter public class RoutingFluidFilter implements IFluidFilter
{ {
protected List<FluidStack> requestList; protected List<FluidStack> requestList;
@ -85,9 +87,13 @@ public class RoutingFluidFilter implements IFluidFilter
} }
} }
@Nullable
public static FluidStack getFluidStackFromItemStack(ItemStack inputStack) public static FluidStack getFluidStackFromItemStack(ItemStack inputStack)
{ {
FluidStack fluidStack = FluidUtil.getFluidContained(inputStack); FluidStack fluidStack = FluidUtil.getFluidContained(inputStack);
if (fluidStack == null)
return null;
fluidStack.amount = inputStack.getCount(); fluidStack.amount = inputStack.getCount();
return fluidStack; return fluidStack;
} }