mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-01-12 10:20:28 +00:00
Code Issues Releases Wiki Activity

Merge pull request #457 from SquidDev-CC/ComputerCraft/hotfix/computer-reload

Browse Source 
Turn on ServerComputer instances if they have timed out
This commit is contained in:
SquidDev 2017-11-14 21:14:49 +00:00
commit b6f773ffce
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/dan200/computercraft/shared/computer/blocks/TileComputerBase.java
View File

@ -37,6 +37,7 @@ public abstract class TileComputerBase extends TileGeneric
protected String m_label;
protected boolean m_on;
protected boolean m_startOn;
protected boolean m_fresh;
protected TileComputerBase()
{
@ -45,6 +46,7 @@ public abstract class TileComputerBase extends TileGeneric
m_label = null;
m_on = false;
m_startOn = false;
m_fresh = false;
}
@Override
@ -213,7 +215,7 @@ public abstract class TileComputerBase extends TileGeneric
ServerComputer computer = createServerComputer();
if( computer != null )
{
if( m_startOn )
if( m_startOn || (m_fresh && m_on) )
{
computer.turnOn();
m_startOn = false;
@ -223,6 +225,7 @@ public abstract class TileComputerBase extends TileGeneric
{
updateOutput();
}
m_fresh = false;
m_computerID = computer.getID();
m_label = computer.getLabel();
m_on = computer.isOn();
@ -471,6 +474,7 @@ public abstract class TileComputerBase extends TileGeneric
{
ServerComputer computer = createComputer( m_instanceID, m_computerID );
ComputerCraft.serverComputerRegistry.add( m_instanceID, computer );
m_fresh = true;
changed = true;
}
if( changed )