Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9

This commit is contained in:
Florian Nücke 2016-06-25 14:26:51 +02:00
commit 6d681464c6

View File

@ -67,6 +67,9 @@ private class Network private(private val data: mutable.Map[String, Network.Vert
// ----------------------------------------------------------------------- //
def connect(nodeA: MutableNode, nodeB: MutableNode) = {
if (nodeA == null) throw new NullPointerException("nodeA")
if (nodeB == null) throw new NullPointerException("nodeB")
if (nodeA == nodeB) throw new IllegalArgumentException(
"Cannot connect a node to itself.")