diff options
| author | GDCloud <93287602+GDCloudstrike@users.noreply.github.com> | 2024-07-02 23:05:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-02 23:05:33 +0200 |
| commit | 30d28a061ec28828b2b1d3a9cc68b31a26ba5dc4 (patch) | |
| tree | b30fc5146be8b4c90200ad5feb46cc7559bd201b | |
| parent | f2744dbc5295a641f938359a4640e8bbd1364bc9 (diff) | |
| download | GT5-Unofficial-30d28a061ec28828b2b1d3a9cc68b31a26ba5dc4.tar.gz GT5-Unofficial-30d28a061ec28828b2b1d3a9cc68b31a26ba5dc4.tar.bz2 GT5-Unofficial-30d28a061ec28828b2b1d3a9cc68b31a26ba5dc4.zip | |
Fix DTPF convergence void protection machine crash (#2703)
fix crash with void protection
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_OverclockCalculator.java | 7 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/util/GT_OverclockCalculator.java b/src/main/java/gregtech/api/util/GT_OverclockCalculator.java index 609a196e80..3a08988339 100644 --- a/src/main/java/gregtech/api/util/GT_OverclockCalculator.java +++ b/src/main/java/gregtech/api/util/GT_OverclockCalculator.java @@ -565,6 +565,13 @@ public class GT_OverclockCalculator { } /** + * @return Whether the calculation has happened + */ + public boolean getCalculationStatus() { + return calculated; + } + + /** * Returns duration as a double to show how much it is overclocking too much to determine extra parallel. This * doesn't count as calculating */ diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java index a9cb2121a5..b627f62b25 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java @@ -793,7 +793,9 @@ public class GT_MetaTileEntity_PlasmaForge extends for (FluidStack fuel : valid_fuels) { if (tRecipe.mFluidInputs[i].isFluidEqual(fuel)) { recalculateDiscount(); - if (discount == maximum_discount && convergence && overclockCalculator != null) { + if (discount == maximum_discount && convergence + && overclockCalculator != null + && overclockCalculator.getCalculationStatus()) { calculateCatalystIncrease(tRecipe, i, false); } tRecipe.mFluidInputs[i].amount = (int) Math.round(tRecipe.mFluidInputs[i].amount * discount); @@ -803,7 +805,10 @@ public class GT_MetaTileEntity_PlasmaForge extends } } // Convergence adjusts the recipe even if it has no catalyst input - if (!adjusted && discount == maximum_discount && convergence && overclockCalculator != null) { + if (!adjusted && discount == maximum_discount + && convergence + && overclockCalculator != null + && overclockCalculator.getCalculationStatus()) { recalculateDiscount(); calculateCatalystIncrease(tRecipe, 0, true); } |