diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index 1f49eac4e..e6ef8bb6a 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -68,6 +68,8 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, public boolean redstonePowered = false; public boolean redstoneReactive = true; + + public boolean forceUpdate = false; public ConnectionType[] connectionTypes = {ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL, ConnectionType.NORMAL}; public TileEntity[] cachedAcceptors = new TileEntity[6]; @@ -177,10 +179,19 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, } } - if(sendDesc && !world().isRemote) + if(!world().isRemote) { - sendDescUpdate(); - sendDesc = false; + if(forceUpdate) + { + refreshConnections(); + forceUpdate = false; + } + + if(sendDesc) + { + sendDescUpdate(); + sendDesc = false; + } } } @@ -276,6 +287,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, cachedAcceptors[side.ordinal()] = tileEntity; markDirtyAcceptor(side); } + return true; } } @@ -321,7 +333,15 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, { if(canConnectMutual(side)) { - TileEntity tileEntity = Coord4D.get(tile()).getFromSide(side).getTileEntity(world()); + Coord4D coord = Coord4D.get(tile()).getFromSide(side); + + if(!world().isRemote && !coord.exists(world())) + { + forceUpdate = true; + continue; + } + + TileEntity tileEntity = coord.getTileEntity(world()); if(isValidAcceptor(tileEntity, side)) { @@ -330,10 +350,12 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, cachedAcceptors[side.ordinal()] = tileEntity; markDirtyAcceptor(side); } + connections |= 1 << side.ordinal(); continue; } } + if(cachedAcceptors[side.ordinal()] != null) { cachedAcceptors[side.ordinal()] = null; @@ -602,11 +624,11 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, redstonePowered = false; } - byte possibleTransmitters = getPossibleTransmitterConnections(); - byte possibleAcceptors = getPossibleAcceptorConnections(); - if(!world().isRemote) { + byte possibleTransmitters = getPossibleTransmitterConnections(); + byte possibleAcceptors = getPossibleAcceptorConnections(); + if((possibleTransmitters | possibleAcceptors) != getAllCurrentConnections()) { sendDesc = true;