Merge pull request from Prototik/pump-drain-crash

Fix pump crash
This commit is contained in:
SpaceToad 2014-05-29 11:22:35 +02:00
commit a3c2854791

View file

@ -163,7 +163,7 @@ public final class BlockUtil {
public static FluidStack drainBlock(Block block, World world, int x, int y, int z, boolean doDrain) {
Fluid fluid = FluidRegistry.lookupFluidForBlock(block);
if (fluid != null) {
if (fluid != null && FluidRegistry.isFluidRegistered(fluid)) {
int meta = world.getBlockMetadata(x, y, z);
if (meta != 0) {