From de44148df3b7f51b0076fddee2a6d9e18255cb3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Thu, 7 Aug 2014 17:33:30 +0200 Subject: [PATCH] Fixed potential NPE in server rack (since: sided fix for internal switch mode). --- src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala b/src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala index e47c39ce6..785a1f1cb 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala @@ -363,8 +363,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 _ => }