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 } 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)