diff options
| author | Dream-Master <dream-master@gmx.net> | 2018-10-07 20:41:22 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2018-10-07 20:41:22 +0200 |
| commit | 0e5d1f7662cff85742aaaffe717dc15942a2ce2d (patch) | |
| tree | cc67ec662a35a620f29de7eeeb3f6bfb2b12270c /src/main/java/gregtech/common/tileentities/machines/steam | |
| parent | ee452b9fa5da1e927140fdf8f4581d22637d1cb9 (diff) | |
| download | GT5-Unofficial-0e5d1f7662cff85742aaaffe717dc15942a2ce2d.tar.gz GT5-Unofficial-0e5d1f7662cff85742aaaffe717dc15942a2ce2d.tar.bz2 GT5-Unofficial-0e5d1f7662cff85742aaaffe717dc15942a2ce2d.zip | |
cherry pick b46a466878c07f8343894899304dce605b6b1d44 [b46a466]
Fixed bug in macerator recipes. (#1468)
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/steam')
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java index c01b138682..7b60e70ad1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java @@ -61,11 +61,11 @@ public class GT_MetaTileEntity_Macerator_Bronze extends GT_MetaTileEntity_BasicM // if (!tRecipe.isRecipeInputEqual(true, new FluidStack[]{getFillableStack()}, getAllInputs())) // return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; - + if (!tRecipe.isRecipeInputEqual(true, new FluidStack[]{getFillableStack()}, getAllInputs())) + return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS; if (tRecipe.getOutput(0) != null) mOutputItems[0] = tRecipe.getOutput(0); this.mEUt = tRecipe.mEUt; this.mMaxProgresstime = (tRecipe.mDuration * 2); - getInputAt(0).stackSize -= tRecipe.mInputs[0].stackSize; return FOUND_AND_SUCCESSFULLY_USED_RECIPE; } diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java index b127f839ed..4e98d1ce79 100644 --- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java +++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java @@ -61,11 +61,11 @@ public class GT_MetaTileEntity_Macerator_Steel extends GT_MetaTileEntity_BasicMa // if (!tRecipe.isRecipeInputEqual(true, new FluidStack[]{getFillableStack()}, getAllInputs()))
// return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
-
+ if (!tRecipe.isRecipeInputEqual(true, new FluidStack[]{getFillableStack()}, getAllInputs()))
+ return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
if (tRecipe.getOutput(0) != null) mOutputItems[0] = tRecipe.getOutput(0);
this.mEUt = (2 * tRecipe.mEUt);
this.mMaxProgresstime = tRecipe.mDuration;
- getInputAt(0).stackSize -= tRecipe.mInputs[0].stackSize;
return FOUND_AND_SUCCESSFULLY_USED_RECIPE;
}
|