Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10

This commit is contained in:
Florian Nücke 2014-08-07 17:34:07 +02:00
commit 63740cac8a

View File

@ -361,8 +361,9 @@ class ServerRack extends traits.PowerAcceptor with traits.Hub with traits.PowerB
for (number <- 0 until servers.length) {
val serverSide = sides(number)
servers(number) match {
case Some(server) if toGlobal(serverSide) == plug.side =>
plug.node.connect(server.machine.node)
case Some(server) =>
if (toGlobal(serverSide) == plug.side) plug.node.connect(server.machine.node)
else api.Network.joinNewNetwork(server.machine.node)
terminals(number).connect(server.machine.node)
case _ =>
}