aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-04-03 09:07:44 +0200
committerTechnus <daniel112092@gmail.com>2017-04-03 09:07:44 +0200
commit68f54791999070106462be0cbaae6235ef9b879b (patch)
tree8a73d4b8f1b8cb27a2fde0f9f045118f01bb5344 /src/main/java/gregtech
parent9edf005c3cbd6e4c8c00eddf13d88b670cd3895b (diff)
downloadGT5-Unofficial-68f54791999070106462be0cbaae6235ef9b879b.tar.gz
GT5-Unofficial-68f54791999070106462be0cbaae6235ef9b879b.tar.bz2
GT5-Unofficial-68f54791999070106462be0cbaae6235ef9b879b.zip
Fusion fix
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java4
1 files changed, 2 insertions, 2 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 a518608355..c69f5905e2 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
@@ -265,7 +265,7 @@ 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 (tRecipe == null && !mRunningOnLoad) {
+ if ((tRecipe == null && !mRunningOnLoad) || (maxEUStore() < tRecipe.mSpecialValue)) {
turnCasingActive(false);
this.mLastRecipe = null;
return false;
@@ -372,7 +372,7 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity
mMaxProgresstime = 0;
turnCasingActive(false);
}
- aBaseMetaTileEntity.decreaseStoredEnergyUnits(this.mLastRecipe.mSpecialValue, true);
+ aBaseMetaTileEntity.decreaseStoredEnergyUnits(this.mLastRecipe.mSpecialValue - this.mEUt, true);
}
}
if (mMaxProgresstime <= 0)