From e5ccda83f01d9d40589109e48113b8c57c08c035 Mon Sep 17 00:00:00 2001 From: payonel Date: Sat, 22 Sep 2018 06:48:09 -0700 Subject: [PATCH] use Node to find the angel upgrade closes #2573 --- .../scala/li/cil/oc/common/event/AngelUpgradeHandler.scala | 6 +++--- src/main/scala/li/cil/oc/common/tileentity/Robot.scala | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/scala/li/cil/oc/common/event/AngelUpgradeHandler.scala b/src/main/scala/li/cil/oc/common/event/AngelUpgradeHandler.scala index 40b03b498..9c13d3f3f 100644 --- a/src/main/scala/li/cil/oc/common/event/AngelUpgradeHandler.scala +++ b/src/main/scala/li/cil/oc/common/event/AngelUpgradeHandler.scala @@ -2,7 +2,7 @@ package li.cil.oc.common.event import cpw.mods.fml.common.eventhandler.SubscribeEvent 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 scala.collection.convert.WrapAsScala._ @@ -12,8 +12,8 @@ object AngelUpgradeHandler { def onPlaceInAir(e: RobotPlaceInAirEvent) { val machineNode = e.agent.machine.node e.setAllowed(machineNode.reachableNodes.exists { - case component: Component if component.canBeSeenFrom(machineNode) => - component.host.isInstanceOf[UpgradeAngel] + case node: Node if node.canBeReachedFrom(machineNode) => + node.host.isInstanceOf[UpgradeAngel] case _ => false }) } diff --git a/src/main/scala/li/cil/oc/common/tileentity/Robot.scala b/src/main/scala/li/cil/oc/common/tileentity/Robot.scala index 6ab1cc330..14803b39d 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/Robot.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/Robot.scala @@ -250,7 +250,7 @@ class Robot extends traits.Computer with traits.PowerInformation with IFluidHand else { world.setBlockToAir(newPosition) } - created && BlockPosition(this) == newPosition + created && this.position == newPosition } finally { blockRobotProxy.moving.set(None)