Fixed reactors shutting off when unloaded

This commit is contained in:
aidancbrady committed 2016-03-17 20:11:38 -04:00
1 parent 650b725567
commit e53c00d2b8
4 files changed
+13 -13

No files matched your search

@@ -35,7 +35,7 @@ public interface IFusionReactor extends IHeatTransfer
public double getBufferSize();
public void formMultiblock();
public void formMultiblock(boolean keepBurning);
public boolean isFormed();
@@ -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;
}
@@ -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);
}
}
}
@@ -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