From 37e35d594373df89996fbb8773e77809a8ca32a5 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Mon, 22 Dec 2014 23:40:03 +0000 Subject: [PATCH] Make loading the reactor from file update the "last" temperatures. --- src/main/java/mekanism/api/reactor/IFusionReactor.java | 2 ++ src/main/java/mekanism/generators/common/FusionReactor.java | 6 ++++++ .../common/tile/reactor/TileEntityReactorController.java | 1 + 3 files changed, 9 insertions(+) diff --git a/src/main/java/mekanism/api/reactor/IFusionReactor.java b/src/main/java/mekanism/api/reactor/IFusionReactor.java index 62df5a301..ef19fc066 100644 --- a/src/main/java/mekanism/api/reactor/IFusionReactor.java +++ b/src/main/java/mekanism/api/reactor/IFusionReactor.java @@ -58,4 +58,6 @@ public interface IFusionReactor extends IHeatTransfer public double getPassiveGeneration(boolean active, boolean current); public int getSteamPerTick(boolean current); + + public void updateTemperatures(); } diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index 4106af52f..40cbda53e 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -137,6 +137,12 @@ public class FusionReactor implements IFusionReactor kill(); } + updateTemperatures(); + } + + @Override + public void updateTemperatures() + { lastPlasmaTemperature = plasmaTemperature < 1E-1 ? 0 : plasmaTemperature; lastCaseTemperature = caseTemperature < 1E-1 ? 0 : caseTemperature; } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java index f36ddc4cb..dff89f1b8 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -165,6 +165,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen getReactor().setCaseTemp(tag.getDouble("caseTemp")); getReactor().setInjectionRate(tag.getInteger("injectionRate")); getReactor().setBurning(tag.getBoolean("burning")); + getReactor().updateTemperatures(); } fuelTank.read(tag.getCompoundTag("fuelTank"));