Merge pull request #7 from alkcorp/master

sync

2 files changed, 5 insertions, 7 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index 4a6cad20c3..f41efe602a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -770,7 +770,7 @@ public abstract class GregtechMeta_MultiBlockBase extends GT_MetaTileEntity_Mult
 			// We have Fluid Stacks we did not merge. Do we have space?
 			if (aOutputFluids.size() > 0) {
 				// Not enough space to add fluids.
-				if (aOutputFluids.size() < aEmptyFluidHatches) {
+				if (aOutputFluids.size() > aEmptyFluidHatches) {
 					Logger.INFO("Failed to find enough space for all fluid outputs.");
 					return false;
 				}
@@ -790,7 +790,7 @@ public abstract class GregtechMeta_MultiBlockBase extends GT_MetaTileEntity_Mult
 	public static Method aLogger = null;
 
 	public void log(String s) {
-		boolean reset = true;
+		boolean reset = false;
 		if (reset || aLogger == null) {
 			if (!AsmConfig.disableAllLogging) {
 				aLogger = ReflectionUtils.getMethod(
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
index b6e7b35d68..e72838fcad 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java
@@ -267,12 +267,10 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_
 				final int tFuelValue = this.getFuelValue(this.mFluid), tConsumed = this.consumedFluidPerOperation(this.mFluid);
 				if ((tFuelValue > 0) && (tConsumed > 0) && (this.mFluid.amount >= tConsumed)) {
 					final long tFluidAmountToUse = Math.min(this.mFluid.amount / tConsumed, (((this.maxEUOutput() * 20) + this.getMinimumStoredEU()) - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue);
-					if ((tFluidAmountToUse > 0) && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true)){					
-						useFuel = Utils.invertBoolean(useFuel);			
-						int aSafeFloor= (int) Math.max(((tFluidAmountToUse * tConsumed)/3), 1);
-						int toConsumeTrue = (int) (useFuel ? aSafeFloor : 0);
+					if ((tFluidAmountToUse > 0) && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true)){							
+						int aSafeFloor = (int) Math.max(((tFluidAmountToUse * tConsumed)/3), 1); 
 						//Logger.INFO("True consumption: "+toConsumeTrue+" | Consuming this tick? "+useFuel);
-						this.mFluid.amount -= toConsumeTrue;
+						this.mFluid.amount -= (int) aSafeFloor;
 						PollutionUtils.addPollution(getBaseMetaTileEntity(), 10 * getPollution());
 					}
 				}