tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Merge branch 'development' into 1.8

Browse source
This commit is contained in:
Ben Spiers 2014-08-14 23:37:28 +01:00
commit 41e118ba2e
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/mekanism/common/multipart/PartSidedPipe.java
View file

@ -462,6 +462,8 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
protected void onRedstoneSplit() {}
protected void onRedstoneJoin() {}
protected void onRefresh() {}
public void redstoneRefresh()
@ -491,6 +493,10 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
{
onRedstoneSplit();
}
else
{
onRedstoneJoin();
}
tile().notifyTileChange();
}

11
src/main/java/mekanism/common/multipart/PartTransmitter.java
View file

@ -37,8 +37,8 @@ public abstract class PartTransmitter<N extends DynamicNetwork<?, N>> extends Pa
@Override
public void refreshTransmitterNetwork()
{
((DynamicNetwork<?,N>)getTransmitterNetwork()).refresh(this);
((DynamicNetwork<?,N>)getTransmitterNetwork()).refresh();
getTransmitterNetwork().refresh(this);
getTransmitterNetwork().refresh();
}
@Override
@ -54,6 +54,13 @@ public abstract class PartTransmitter<N extends DynamicNetwork<?, N>> extends Pa
setTransmitterNetwork(null);
}
@Override
public void onRedstoneJoin()
{
setTransmitterNetwork(null);
getTransmitterNetwork();
}
@Override
public void setTransmitterNetwork(N network)
{