Merge pull request #693 from hilburn/master

fixes #692
iopleke · Mar 4, 2015 · 53bc9d1 · 53bc9d1
2 parents 26d9b97 + e55c97d
commit 53bc9d1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/minechem/tileentity/decomposer/DecomposerTileEntity.java b/src/main/java/minechem/tileentity/decomposer/DecomposerTileEntity.java
@@ -331,7 +331,8 @@ public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrai
         tankUpdate = true;
 
         tank.amount -= drained;
-        return new FluidStack(tank.fluidID, drained);
+        if (tank.amount == 0) tank = null;
+        return new FluidStack(resource.fluidID, drained);
     }
 
     @Override
@@ -351,8 +352,9 @@ public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain)
         tankUpdate = true;
 
         tank.amount -= drained;
+        FluidStack result = new FluidStack(tank.fluidID, drained);
         if (tank.amount==0) tank=null;
-        return new FluidStack(tank.fluidID, drained);
+        return result;
     }
 
     /**