AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-30 08:31:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Florian Nücke 2015-02-27 12:57:12 +01:00
commit efd8fbde2a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/common/EventHandler.scala
View File

@ -121,7 +121,7 @@ object EventHandler {
val invalid = mutable.ArrayBuffer.empty[Robot] val invalid = mutable.ArrayBuffer.empty[Robot]
runningRobots.foreach(robot => { runningRobots.foreach(robot => {
if (robot.isInvalid) invalid += robot if (robot.isInvalid) invalid += robot
else robot.machine.update() else if (robot.world != null) robot.machine.update()
}) })
runningRobots --= invalid runningRobots --= invalid
} }

2
src/main/scala/li/cil/oc/integration/fmp/CablePart.scala
View File

@ -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 { 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() val node = api.Network.newNode(this, Visibility.None).create()
private var _color = 0 private var _color = Color.LightGray
original.foreach(cable => _color = cable.color) original.foreach(cable => _color = cable.color)