From 7149eeabc4a3e5b0a8a2ec19e1bfcef0c0e954e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Wed, 16 Jul 2014 18:05:18 +0200 Subject: [PATCH] Fixed robots bouncing back network messages. --- src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala | 2 +- src/main/scala/li/cil/oc/server/component/robot/Robot.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala b/src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala index 81507ebb2..0e758e213 100644 --- a/src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala +++ b/src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala @@ -67,7 +67,7 @@ class RobotProxy(val robot: Robot) extends traits.Computer with traits.PowerInfo override def onMessage(message: Message) { super.onMessage(message) - if (message.name == "network.message" && message.source != robot.node) message.data match { + if (message.name == "network.message" && message.source != this.node) message.data match { case Array(packet: Packet) => robot.node.sendToReachable(message.name, packet) case _ => } diff --git a/src/main/scala/li/cil/oc/server/component/robot/Robot.scala b/src/main/scala/li/cil/oc/server/component/robot/Robot.scala index 4c4dbadb0..4e1e84114 100644 --- a/src/main/scala/li/cil/oc/server/component/robot/Robot.scala +++ b/src/main/scala/li/cil/oc/server/component/robot/Robot.scala @@ -496,7 +496,7 @@ class Robot(val robot: tileentity.Robot) extends ManagedComponent { override def onMessage(message: Message) { super.onMessage(message) - if (message.name == "network.message" && message.source != robot.proxy.node) message.data match { + if (message.name == "network.message" && message.source != robot.node) message.data match { case Array(packet: Packet) => robot.proxy.node.sendToReachable(message.name, packet) case _ => }