From 504f27613f5ee31cc35bc745364a26c251f87b1e Mon Sep 17 00:00:00 2001 From: Chicken Bones Date: Fri, 6 Sep 2013 15:08:22 +1000 Subject: [PATCH] fix NPE in TFluidHandlerTile --- .../multipart/scalatraits/TFluidHandlerTile.scala | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/codechicken/multipart/scalatraits/TFluidHandlerTile.scala b/codechicken/multipart/scalatraits/TFluidHandlerTile.scala index eb1af7e..bdb284a 100644 --- a/codechicken/multipart/scalatraits/TFluidHandlerTile.scala +++ b/codechicken/multipart/scalatraits/TFluidHandlerTile.scala @@ -78,19 +78,23 @@ trait TFluidHandlerTile extends TileMultipart with IFluidHandler override def drain(dir:ForgeDirection, amount:Int, doDrain:Boolean):FluidStack = { var drained:FluidStack = null + var d_amount = 0 tankList.foreach{p => - val ret = p.drain(dir, amount-drained.amount, false) + val ret = p.drain(dir, amount-d_amount, false) if(ret != null && ret.amount > 0 && (drained == null || drained.isFluidEqual(ret))) { if(doDrain) - p.drain(dir, amount-drained.amount, true) + p.drain(dir, amount-d_amount, true) if(drained == null) drained = ret else - drained.amount+=ret.amount + d_amount+=ret.amount } } + if(drained != null) + drained.amount = d_amount + return drained } } \ No newline at end of file