From 87aa1f44a99b84f9f692a69b09e633105ef67691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Fri, 18 Oct 2013 21:48:41 +0200 Subject: [PATCH] redstone, oh how i loathe ye --- li/cil/oc/common/tileentity/Computer.scala | 6 +++--- li/cil/oc/server/component/Redstone.scala | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/li/cil/oc/common/tileentity/Computer.scala b/li/cil/oc/common/tileentity/Computer.scala index 7cf5daea0..dce3aa64c 100644 --- a/li/cil/oc/common/tileentity/Computer.scala +++ b/li/cil/oc/common/tileentity/Computer.scala @@ -119,13 +119,13 @@ class Computer(isClient: Boolean) extends Rotatable with component.Computer.Envi override def input(side: ForgeDirection) = { val global = toGlobal(side) - worldObj.isBlockProvidingPowerTo( - xCoord + global.offsetX, yCoord + global.offsetY, zCoord + global.offsetZ, global.getOpposite.ordinal) + worldObj.getIndirectPowerLevelTo( + xCoord + global.offsetX, yCoord + global.offsetY, zCoord + global.offsetZ, global.ordinal()) } override protected def onRedstoneInputChanged(side: ForgeDirection) { super.onRedstoneInputChanged(side) - computer.signal("redstone_changed", toLocal(side).ordinal()) + computer.signal("redstone_changed", side.ordinal()) } override protected def onRedstoneOutputChanged(side: ForgeDirection) { diff --git a/li/cil/oc/server/component/Redstone.scala b/li/cil/oc/server/component/Redstone.scala index 8395cc23c..25710451f 100644 --- a/li/cil/oc/server/component/Redstone.scala +++ b/li/cil/oc/server/component/Redstone.scala @@ -61,7 +61,6 @@ trait Redstone extends Node { override def receive(message: Message) = super.receive(message).orElse { message.data match { case Array(side: ForgeDirection) if message.name == "redstone.input" && side != ForgeDirection.UNKNOWN => - checkRedstoneInputChanged() result(_input(side.ordinal())) case Array(side: ForgeDirection) if message.name == "redstone.output" && side != ForgeDirection.UNKNOWN => result(output(side))