AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-08-03 19:17:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-MC1.10' into master-MC1.11

Browse Source 
# Conflicts:
#	src/main/scala/li/cil/oc/util/FluidUtils.scala
This commit is contained in:
payonel 2019-11-14 22:46:48 -08:00
commit ba7e110c5f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/util/FluidUtils.scala
View File

@ -174,7 +174,7 @@ object FluidUtils {
def canFill(fluid: Fluid): Boolean = fluid.canBePlacedInWorld
override def fill(resource: FluidStack, doFill: Boolean): Int = {
if (resource != null && resource.getFluid.canBePlacedInWorld && resource.getFluid.getBlock != null) {
if (resource != null && resource.getFluid.canBePlacedInWorld && resource.getFluid.getBlock != null && resource.amount >= 1000) {
if (doFill) {
val world = position.world.get
if (!world.isAirBlock(position) && !world.containsAnyLiquid(position.bounds))