make drain function w/ fluid argument work

SlimeKnights · Sep 7, 2014 · b13e2b5 · b13e2b5
1 parent 2342d4a
commit b13e2b5
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java
@@ -54,16 +54,19 @@ public FluidStack drain (ForgeDirection from, int maxDrain, boolean doDrain)
             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 int comparatorStrength()
         SmelteryLogic smeltery = (SmelteryLogic) worldObj.getTileEntity(master.x, master.y, master.z);
         return 15 * smeltery.currentLiquid / smeltery.maxLiquid;
     }
-}
+}