aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2016-09-28 19:55:31 +0200
committerBlood-Asp <bloodasphendrik@gmail.com>2016-09-28 19:55:31 +0200
commit18e8ee1ad3b83473d541b6bcffc25e6351cb2361 (patch)
treeb15528f458523bb48e02cb0b0fb0e457cf0d46be /src/main
parent7b8573d32e0b7337856967fb178c42d673e1fde2 (diff)
downloadGT5-Unofficial-18e8ee1ad3b83473d541b6bcffc25e6351cb2361.tar.gz
GT5-Unofficial-18e8ee1ad3b83473d541b6bcffc25e6351cb2361.tar.bz2
GT5-Unofficial-18e8ee1ad3b83473d541b6bcffc25e6351cb2361.zip
Fix fusion reactor not using input fluids.
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
index 3a54bce66d..1803ab0b15 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
@@ -252,11 +252,12 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity
if (tFluidList.size() > 1) {
FluidStack[] tFluids = tFluidList.toArray(new FluidStack[tFluidList.size()]);
GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sFusionRecipes.findRecipe(this.getBaseMetaTileEntity(), this.mLastRecipe, false, GT_Values.V[8], tFluids, new ItemStack[]{});
- if (mRunningOnLoad) {
+ if (tRecipe == null && !mRunningOnLoad) {
turnCasingActive(false);
this.mLastRecipe = null;
return false;
}
+ if (mRunningOnLoad || tRecipe.isRecipeInputEqual(true, tFluids, new ItemStack[]{})) {
this.mLastRecipe = tRecipe;
this.mEUt = (this.mLastRecipe.mEUt * overclock(this.mLastRecipe.mSpecialValue));
this.mMaxProgresstime = this.mLastRecipe.mDuration / overclock(this.mLastRecipe.mSpecialValue);
@@ -265,6 +266,7 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity
turnCasingActive(true);
mRunningOnLoad = false;
return true;
+ }
}
return false;
}