From c800262ac7a4f277d5aed5f27225ee202e56f644 Mon Sep 17 00:00:00 2001
From: kekzdealer <kekzdealer@gmail.com>
Date: Fri, 8 May 2020 01:50:11 +0200
Subject: Code cleanup

---
 src/main/java/kekztech/MultiFluidHandler.java | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'src/main/java/kekztech')

diff --git a/src/main/java/kekztech/MultiFluidHandler.java b/src/main/java/kekztech/MultiFluidHandler.java
index 407fb32e54..f1a527b2c0 100644
--- a/src/main/java/kekztech/MultiFluidHandler.java
+++ b/src/main/java/kekztech/MultiFluidHandler.java
@@ -200,18 +200,15 @@ public class MultiFluidHandler {
 	 * @return Amount of fluid that was (or would have been, if simulated) pulled.
 	 */
 	public int pullFluid(FluidStack pull, boolean doPull) {
-		if(locked) {
-			return 0;
-		}
-		if(!contains(pull)) {
+		if (locked || !contains(pull)) {
 			return 0;
 		} else {
 			final FluidStack src = fluids.get(fluids.indexOf(pull));
 			final int rec = Math.min(pull.amount, src.amount);
-			if(doPull) {
+			if (doPull) {
 				src.amount -= rec;
 			}
-			if(src.amount == 0) {
+			if (src.amount == 0) {
 				fluids.remove(src);
 			}
 			return rec;
@@ -239,13 +236,13 @@ public class MultiFluidHandler {
 		if(!fluids.get(slot).equals(pull)) {
 			return 0;
 		} else {
-			final FluidStack pulled = fluids.get(slot);
-			final int rec = Math.min(pull.amount, pulled.amount);
+			final FluidStack src = fluids.get(slot);
+			final int rec = Math.min(pull.amount, src.amount);
 			if(doPull) {
-				pulled.amount -= rec;
+				src.amount -= rec;
 			}
-			if(pulled.amount == 0) {
-				fluids.remove(pulled);
+			if(src.amount == 0) {
+				fluids.remove(src);
 			}
 			return rec;
 		}
-- 
cgit