AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 11:15:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-MC1.11' into master-MC1.12

Browse Source
This commit is contained in:
payonel 2018-09-22 06:55:47 -07:00
commit dde857f4bc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/li/cil/oc/common/event/AngelUpgradeHandler.scala
View File

@ -1,7 +1,7 @@
package li.cil.oc.common.event package li.cil.oc.common.event
import li.cil.oc.api.event.RobotPlaceInAirEvent import li.cil.oc.api.event.RobotPlaceInAirEvent
import li.cil.oc.api.network.Component import li.cil.oc.api.network.Node
import li.cil.oc.server.component.UpgradeAngel import li.cil.oc.server.component.UpgradeAngel
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@ -12,8 +12,8 @@ object AngelUpgradeHandler {
def onPlaceInAir(e: RobotPlaceInAirEvent) { def onPlaceInAir(e: RobotPlaceInAirEvent) {
val machineNode = e.agent.machine.node val machineNode = e.agent.machine.node
e.setAllowed(machineNode.reachableNodes.exists { e.setAllowed(machineNode.reachableNodes.exists {
case component: Component if component.canBeSeenFrom(machineNode) => case node: Node if node.canBeReachedFrom(machineNode) =>
component.host.isInstanceOf[UpgradeAngel] node.host.isInstanceOf[UpgradeAngel]
case _ => false case _ => false
}) })
} }

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

@ -275,7 +275,7 @@ class Robot extends traits.Computer with traits.PowerInformation with traits.Rot
else { else {
getWorld.setBlockToAir(newPosition) getWorld.setBlockToAir(newPosition)
} }
created && BlockPosition(this) == newPosition created && this.position == newPosition
} }
finally { finally {
blockRobotProxy.moving.set(None) blockRobotProxy.moving.set(None)