Cleanup the codebase (#3311)

Co-authored-by: boubou19 <miisterunknown@gmail.com>

1 files changed, 4 insertions, 7 deletions

diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java
index 13f12503f0..2c93631b4d 100644
--- a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java
+++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java
@@ -15,7 +15,7 @@ public class BTF_FluidTank extends FluidTank {
 
     /**
      * Let's replace the Default handling with GT's own handling code, because it's probably better, right?
-     * 
+     *
      * @author Alkalus/GregoriusT
      */
     @Override
@@ -132,13 +132,10 @@ public class BTF_FluidTank extends FluidTank {
     public FluidStack drain(int maxDrain, boolean doDrain) {
         if (this.getDrainableStack() != null && this.canTankBeEmptied()) {
             if (this.getDrainableStack().amount <= 0 && this.isFluidChangingAllowed()) {
-                this.setDrainableStack((FluidStack) null);
+                this.setDrainableStack(null);
                 return null;
             } else {
-                int used = maxDrain;
-                if (this.getDrainableStack().amount < maxDrain) {
-                    used = this.getDrainableStack().amount;
-                }
+                int used = Math.min(this.getDrainableStack().amount, maxDrain);
 
                 if (doDrain) {
                     FluidStack arg9999 = this.getDrainableStack();
@@ -149,7 +146,7 @@ public class BTF_FluidTank extends FluidTank {
                     .copy();
                 drained.amount = used;
                 if (this.getDrainableStack().amount <= 0 && this.isFluidChangingAllowed()) {
-                    this.setDrainableStack((FluidStack) null);
+                    this.setDrainableStack(null);
                 }
 
                 return drained;