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

Make redstone-split transmitters join correctly again. Presumably this being broken is why merge() was unused.

Browse source
This commit is contained in:
Ben Spiers 2014-08-14 23:29:18 +01:00
parent 98ee002472
commit 7813fad1ab
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

@ -458,6 +458,8 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
protected void onRedstoneSplit() {}
protected void onRedstoneJoin() {}
protected void onRefresh() {}
public void refreshConnections()
@ -477,6 +479,10 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart,
{
onRedstoneSplit();
}
else
{
onRedstoneJoin();
}
tile().notifyPartChange(this);
}

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

@ -39,8 +39,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
@ -56,6 +56,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)
{