From bc1434ff04f606fcd6487db7909a16497284e430 Mon Sep 17 00:00:00 2001 From: Vilim Date: Sun, 25 May 2014 19:59:59 +0200 Subject: [PATCH] Make finite fluid blocks drainable --- .../net/minecraftforge/fluids/BlockFluidFinite.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/fluids/BlockFluidFinite.java b/src/main/java/net/minecraftforge/fluids/BlockFluidFinite.java index ac36dbb12e..52a76a887a 100644 --- a/src/main/java/net/minecraftforge/fluids/BlockFluidFinite.java +++ b/src/main/java/net/minecraftforge/fluids/BlockFluidFinite.java @@ -5,6 +5,7 @@ import java.util.Random; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; +import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -310,12 +311,18 @@ public class BlockFluidFinite extends BlockFluidBase @Override public FluidStack drain(World world, int x, int y, int z, boolean doDrain) { - return null; + if (doDrain) + { + world.setBlock(x, y, z, Blocks.air); + } + + return new FluidStack(getFluid(), + MathHelper.floor_float(getQuantaPercentage(world, x, y, z) * FluidContainerRegistry.BUCKET_VOLUME)); } @Override public boolean canDrain(World world, int x, int y, int z) { - return false; + return true; } }