AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-29 16:03:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17 from botn365/patch-2

Browse Source 
fix selecting fluidhandler with transfer fluids
This commit is contained in:
Martin Robertz 2020-09-29 06:53:58 +02:00 committed by GitHub
commit ad3f68a2af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,8 @@ object FluidUtils {
val ti = source.getTankInfo(sourceSide) val ti = source.getTankInfo(sourceSide)
val srcFluid = if (sourceTank < 0 || ti == null || ti.length <= sourceTank) null else ti(sourceTank).fluid.copy() val srcFluid = if (sourceTank < 0 || ti == null || ti.length <= sourceTank) null else ti(sourceTank).fluid.copy()
val drained = if (srcFluid == null) val nullFluid = srcFluid == null;
val drained = if (nullFluid)
source.drain(sourceSide, limit, false) source.drain(sourceSide, limit, false)
else { else {
srcFluid.amount = limit srcFluid.amount = limit
@ -52,7 +53,12 @@ object FluidUtils {
} }
if (drained != null) { if (drained != null) {
val filled = sink.fill(sinkSide, drained, false) val filled = sink.fill(sinkSide, drained, false)
if (nullFluid) {
sink.fill(sinkSide, source.drain(sourceSide, filled, true), true) sink.fill(sinkSide, source.drain(sourceSide, filled, true), true)
} else {
srcFluid.amount = filled
sink.fill(sinkSide, source.drain(sourceSide, srcFluid, true), true)
}
} else 0 } else 0
} }