From 7813fad1abefe8f918107f5ba26e39db57d1cd0c Mon Sep 17 00:00:00 2001
From: Ben Spiers <ben.spiers22@gmail.com>
Date: Thu, 14 Aug 2014 23:29:18 +0100
Subject: [PATCH] Make redstone-split transmitters join correctly again.
 Presumably this being broken is why merge() was unused.

---
 .../java/mekanism/common/multipart/PartSidedPipe.java |  6 ++++++
 .../mekanism/common/multipart/PartTransmitter.java    | 11 +++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java
index 357510fd0..838396aba 100644
--- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java
+++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java
@@ -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);
 			}
diff --git a/src/main/java/mekanism/common/multipart/PartTransmitter.java b/src/main/java/mekanism/common/multipart/PartTransmitter.java
index f6780a184..01301374d 100644
--- a/src/main/java/mekanism/common/multipart/PartTransmitter.java
+++ b/src/main/java/mekanism/common/multipart/PartTransmitter.java
@@ -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)
 	{