AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-10-03 10:05:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
This commit is contained in:
Florian Nücke 2015-02-23 17:46:41 +01:00
commit 59fba896b4
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,12 @@ object EventHandler {
} }
}) })
runningRobots.foreach(_.machine.update()) val invalid = mutable.ArrayBuffer.empty[Robot]
runningRobots.foreach(robot => {
if (robot.isInvalid) invalid += robot
else robot.machine.update()
})
runningRobots --= invalid
} }
@SubscribeEvent @SubscribeEvent

1
src/main/scala/li/cil/oc/common/tileentity/Robot.scala
View File

@ -485,6 +485,7 @@ class Robot extends traits.Computer with traits.PowerInformation with traits.Rot
// Normally set in superclass, but that's not called directly, only in the // Normally set in superclass, but that's not called directly, only in the
// robot's proxy instance. // robot's proxy instance.
_isOutputEnabled = hasRedstoneCard _isOutputEnabled = hasRedstoneCard
if (isRunning) EventHandler.onRobotStart(this)
} }
// Side check for Waila (and other mods that may call this client side). // Side check for Waila (and other mods that may call this client side).