keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

And handle the null case in the constructor itself. Closes #1794 (again)

Browse source
This commit is contained in:
cpw 2015-04-11 17:38:15 -04:00
parent 230d757a89
commit 5c88164211
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/net/minecraftforge/fluids/FluidStack.java
View file

@ -23,7 +23,12 @@ public class FluidStack
public FluidStack(Fluid fluid, int amount) public FluidStack(Fluid fluid, int amount)
{ {
if (!FluidRegistry.isFluidRegistered(fluid)) if (fluid == null)
{
FMLLog.bigWarning("Null fluid supplied to fluidstack. Did you try and create a stack for an unregistered fluid?");
throw new IllegalArgumentException("Cannot create a fluidstack from a null fluid");
}
else if (!FluidRegistry.isFluidRegistered(fluid))
{ {
FMLLog.bigWarning("Failed attempt to create a FluidStack for an unregistered Fluid %s (type %s)", fluid.getName(), fluid.getClass().getName()); FMLLog.bigWarning("Failed attempt to create a FluidStack for an unregistered Fluid %s (type %s)", fluid.getName(), fluid.getClass().getName());
throw new IllegalArgumentException("Cannot create a fluidstack from an unregistered fluid"); throw new IllegalArgumentException("Cannot create a fluidstack from an unregistered fluid");