From b13e2b5340cc50199eef797d5dcae0174c54ec59 Mon Sep 17 00:00:00 2001 From: Leon Loeser Date: Sun, 7 Sep 2014 18:47:28 +0200 Subject: [PATCH] make drain function w/ fluid argument work --- .../smeltery/logic/SmelteryDrainLogic.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java index 0e75836d..e9f4f1f6 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java @@ -54,16 +54,19 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl SmelteryLogic smeltery = (SmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); return smeltery.drain(maxDrain, doDrain); } - else - { - return null; - } + return null; } @Override public FluidStack drain (ForgeDirection from, FluidStack resource, boolean doDrain) { - // TODO Auto-generated method stub + if (hasValidMaster() && canDrain(from, null)) + { + SmelteryLogic smeltery = (SmelteryLogic) worldObj.getTileEntity(getMasterPosition().x, getMasterPosition().y, getMasterPosition().z); + if(resource.getFluid() == smeltery.getFluid()){ + return smeltery.drain(resource.amount, doDrain); + } + } return null; } @@ -193,4 +196,4 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl SmelteryLogic smeltery = (SmelteryLogic) worldObj.getTileEntity(master.x, master.y, master.z); return 15 * smeltery.currentLiquid / smeltery.maxLiquid; } -} \ No newline at end of file +}