From e53c00d2b807902fa363f403cdb1f862b832e598 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 17 Mar 2016 20:11:38 -0400 Subject: [PATCH] Fixed reactors shutting off when unloaded --- src/main/java/mekanism/api/reactor/IFusionReactor.java | 2 +- .../java/mekanism/generators/common/FusionReactor.java | 8 ++++---- .../common/tile/reactor/TileEntityReactorBlock.java | 8 ++++---- .../common/tile/reactor/TileEntityReactorController.java | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/mekanism/api/reactor/IFusionReactor.java b/src/main/java/mekanism/api/reactor/IFusionReactor.java index ecb2f66e7..da96a27c3 100644 --- a/src/main/java/mekanism/api/reactor/IFusionReactor.java +++ b/src/main/java/mekanism/api/reactor/IFusionReactor.java @@ -35,7 +35,7 @@ public interface IFusionReactor extends IHeatTransfer public double getBufferSize(); - public void formMultiblock(); + public void formMultiblock(boolean keepBurning); public boolean isFormed(); diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index 3d9b58dc7..9ab515397 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -354,7 +354,7 @@ public class FusionReactor implements IFusionReactor } @Override - public void formMultiblock() + public void formMultiblock(boolean keepBurning) { updatedThisTick = true; @@ -367,19 +367,19 @@ public class FusionReactor implements IFusionReactor if(!createFrame(centreOfReactor)) { - unformMultiblock(false); + unformMultiblock(keepBurning); return; } if(!addSides(centreOfReactor)) { - unformMultiblock(false); + unformMultiblock(keepBurning); return; } if(!centreIsClear(centreOfReactor)) { - unformMultiblock(false); + unformMultiblock(keepBurning); return; } diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java index 87657110b..3d2cce459 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java @@ -54,7 +54,7 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock imp if(getReactor() != null) { - getReactor().formMultiblock(); + getReactor().formMultiblock(false); } } @@ -95,7 +95,7 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock imp if(!(this instanceof TileEntityReactorController) && getReactor() != null) { - getReactor().formMultiblock(); + getReactor().formMultiblock(true); } } @@ -108,7 +108,7 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock imp { if(getReactor() != null) { - getReactor().formMultiblock(); + getReactor().formMultiblock(false); } else { updateController(); @@ -124,7 +124,7 @@ public abstract class TileEntityReactorBlock extends TileEntityElectricBlock imp if(found != null && (found.getReactor() == null || !found.getReactor().isFormed())) { - found.formMultiblock(); + found.formMultiblock(false); } } } 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 df5d6745d..ad72c4253 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -71,14 +71,14 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen public void radiateNeutrons(int neutrons) {} //future impl - public void formMultiblock() + public void formMultiblock(boolean keepBurning) { if(getReactor() == null) { setReactor(new FusionReactor(this)); } - getReactor().formMultiblock(); + getReactor().formMultiblock(keepBurning); } public double getPlasmaTemp() @@ -139,7 +139,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen { super.onChunkUnload(); - formMultiblock(); + formMultiblock(true); } @Override @@ -147,7 +147,7 @@ public class TileEntityReactorController extends TileEntityReactorBlock implemen { super.onAdded(); - formMultiblock(); + formMultiblock(false); } @Override