Merge branch 'rv1' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv2

2014-08-27 00:01:59 -05:00
parent 67a8edaade a985d742c5
commit 59925c9145
10 changed files with 41 additions and 58 deletions
@@ -336,7 +336,8 @@ public class BlockCableBus extends AEBaseBlock implements IRedNetConnection
 	@Override
 	public void onNeighborChange(IBlockAccess w, int x, int y, int z, int tileX, int tileY, int tileZ)
 	{
-		cb( w, x, y, z ).onNeighborChanged();
+		if ( Platform.isServer() )
+			cb( w, x, y, z ).onNeighborChanged();
 	}

 	@Override