Merge branch 'development' into 1.8

This commit is contained in:
Ben Spiers committed 2014-08-14 23:37:28 +01:00
commit 41e118ba2e
2 files changed
+15 -2

No files matched your search

@@ -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();
}
@@ -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)
{