Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #2307

Browse source
This commit is contained in:
asiekierka 2014-12-14 23:03:21 +01:00
parent ddf4c717df
commit 1d863e4718
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
common/buildcraft/core/utils/FluidUtils.java
View file

@ -18,15 +18,12 @@ public final class FluidUtils {
if (stack != null) {
if (stack.getItem() instanceof IFluidContainerItem) {
IFluidContainerItem ctr = (IFluidContainerItem) stack.getItem();
if (ctr.getFluid(stack) != null) {
return ctr.getFluid(stack);
}
} else if (FluidContainerRegistry.isFilledContainer(stack) &&
FluidContainerRegistry.getFluidForFilledItem(stack) != null) {
return ctr.getFluid(stack);
} else if (FluidContainerRegistry.isFilledContainer(stack)) {
return FluidContainerRegistry.getFluidForFilledItem(stack);
} else if (stack.getItem() instanceof ItemBlock) {
Block b = Block.getBlockFromItem(stack.getItem());
if (b instanceof IFluidBlock) {
if (b != null && b instanceof IFluidBlock && ((IFluidBlock) b).getFluid() != null) {
return new FluidStack(((IFluidBlock) b).getFluid(), 1000);
}
}
@ -35,10 +32,11 @@ public final class FluidUtils {
}
public static Fluid getFluidFromItemStack(ItemStack stack) {
return getFluidStackFromItemStack(stack).getFluid();
FluidStack fluidStack = getFluidStackFromItemStack(stack);
return fluidStack != null ? fluidStack.getFluid() : null;
}
public static boolean isFluidContainer(ItemStack stack) {
return stack.getItem() instanceof IFluidContainerItem || FluidContainerRegistry.isFilledContainer(stack);
return stack != null && stack.getItem() != null && (stack.getItem() instanceof IFluidContainerItem || FluidContainerRegistry.isFilledContainer(stack));
}
}