mirror of
https://github.com/MightyPirates/OpenComputers.git
synced 2025-10-03 01:55:41 -04:00
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8
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:
commit
59fba896b4
@ -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
|
||||
|
@ -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
|
||||
// robot's proxy instance.
|
||||
_isOutputEnabled = hasRedstoneCard
|
||||
if (isRunning) EventHandler.onRobotStart(this)
|
||||
}
|
||||
|
||||
// Side check for Waila (and other mods that may call this client side).
|
||||
|
Loading…
x
Reference in New Issue
Block a user