Merge pull request #1055 from viliml/patch-2

Temporary solution to fluids eating other fluids
This commit is contained in:
CovertJaguar 2013-07-26 20:51:25 -07:00
commit 71bd0a92fd

View file

@ -103,4 +103,16 @@ public class BlockBuildcraftFluid extends BlockFluidClassic {
FMLClientHandler.instance().getClient().effectRenderer.addEffect(fx);
}
}
@Override
public boolean canDisplace(IBlockAccess world, int x, int y, int z) {
if (world.getBlockMaterial(x, y, z).isLiquid()) return false;
return super.canDisplace(world, x, y, z);
}
@Override
public boolean displaceIfPossible(World world, int x, int y, int z) {
if (world.getBlockMaterial(x, y, z).isLiquid()) return false;
return super.displaceIfPossible(world, x, y, z);
}
}