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

Fixed changing bundled redstone output not causing a block update.

Browse Source 
Bumped version number.
This commit is contained in:
Florian Nücke 2014-04-04 20:41:48 +02:00
parent f384eadeca
commit 40de0cc312
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.properties
View File

@ -1,6 +1,6 @@
minecraft.version=1.6.4
forge.version=9.11.1.964
oc.version=1.2.5
oc.version=1.2.6
ccl.version=1.0.0.62
fmp.version=1.0.0.250
maven.url=file:///var/www/users/fnuecke/maven.cil.li

4
src/main/scala/li/cil/oc/common/tileentity/traits/BundledRedstoneAware.scala
View File

@ -1,6 +1,6 @@
package li.cil.oc.common.tileentity.traits
import cpw.mods.fml.common.{Loader, Optional}
import cpw.mods.fml.common.Optional
import li.cil.oc.Settings
import li.cil.oc.util.ExtendedNBT._
import li.cil.oc.util.mods.{Mods, ProjectRed}
@ -67,7 +67,7 @@ trait BundledRedstoneAware extends RedstoneAware with IBundledEmitter with IBund
}
}
onRedstoneOutputChanged()
onRedstoneOutputChanged(side)
}
// ----------------------------------------------------------------------- //

16
src/main/scala/li/cil/oc/common/tileentity/traits/RedstoneAware.scala
View File

@ -48,13 +48,7 @@ trait RedstoneAware extends RotationAware with IConnectable with IRedstoneEmitte
def output(side: ForgeDirection, value: Int): Unit = if (value != output(side)) {
_output(toLocal(side).ordinal()) = value
val nx = x + side.offsetX
val ny = y + side.offsetY
val nz = z + side.offsetZ
world.notifyBlockOfNeighborChange(nx, ny, nz, block.blockID)
world.notifyBlocksOfNeighborChange(nx, ny, nz, world.getBlockId(nx, ny, nz), side.getOpposite.ordinal)
onRedstoneOutputChanged()
onRedstoneOutputChanged(side)
}
def checkRedstoneInputChanged() {
@ -145,7 +139,13 @@ trait RedstoneAware extends RotationAware with IConnectable with IRedstoneEmitte
else world.markBlockForRenderUpdate(x, y, z)
}
protected def onRedstoneOutputChanged() {
protected def onRedstoneOutputChanged(side: ForgeDirection) {
val nx = x + side.offsetX
val ny = y + side.offsetY
val nz = z + side.offsetZ
world.notifyBlockOfNeighborChange(nx, ny, nz, block.blockID)
world.notifyBlocksOfNeighborChange(nx, ny, nz, world.getBlockId(nx, ny, nz), side.getOpposite.ordinal)
if (isServer) ServerPacketSender.sendRedstoneState(this)
else world.markBlockForRenderUpdate(x, y, z)
}