From 4ceb63e5fb7a14ed93e30ae2ee3df771e6a5499d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Thu, 26 Feb 2015 23:03:13 +0100 Subject: [PATCH 1/2] Fix initial color value for cables when placed as multiparts, closes #942. --- src/main/scala/li/cil/oc/integration/fmp/CablePart.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/li/cil/oc/integration/fmp/CablePart.scala b/src/main/scala/li/cil/oc/integration/fmp/CablePart.scala index fb44f01a1..ec08516ca 100644 --- a/src/main/scala/li/cil/oc/integration/fmp/CablePart.scala +++ b/src/main/scala/li/cil/oc/integration/fmp/CablePart.scala @@ -33,7 +33,7 @@ import scala.collection.convert.WrapAsScala._ class CablePart(val original: Option[tileentity.Cable] = None) extends SimpleBlockPart with TCuboidPart with TNormalOcclusion with network.Environment { val node = api.Network.newNode(this, Visibility.None).create() - private var _color = 0 + private var _color = Color.LightGray original.foreach(cable => _color = cable.color) From 56184a210a88f57817c08fa15d8e812a7751a68f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Fri, 27 Feb 2015 12:55:16 +0100 Subject: [PATCH 2/2] Fixed potential NPE in robot update. --- src/main/scala/li/cil/oc/common/EventHandler.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/li/cil/oc/common/EventHandler.scala b/src/main/scala/li/cil/oc/common/EventHandler.scala index 083fee326..d236182c8 100644 --- a/src/main/scala/li/cil/oc/common/EventHandler.scala +++ b/src/main/scala/li/cil/oc/common/EventHandler.scala @@ -121,7 +121,7 @@ object EventHandler { val invalid = mutable.ArrayBuffer.empty[Robot] runningRobots.foreach(robot => { if (robot.isInvalid) invalid += robot - else robot.machine.update() + else if (robot.world != null) robot.machine.update() }) runningRobots --= invalid }