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

Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7

Browse Source
This commit is contained in:
Florian Nücke 2014-03-06 13:22:32 +01:00
commit 88cecdfc7e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,9 +61,9 @@ class Hologram extends Environment with SidedEnvironment {
// ----------------------------------------------------------------------- //
@SideOnly(Side.CLIENT)
override def canConnect(side: ForgeDirection) = side != ForgeDirection.UP
override def canConnect(side: ForgeDirection) = side == ForgeDirection.DOWN
override def sidedNode(side: ForgeDirection) = node
override def sidedNode(side: ForgeDirection) = if (side == ForgeDirection.DOWN) node else null
// ----------------------------------------------------------------------- //

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

@ -34,6 +34,10 @@ class WirelessRouter extends Router with WirelessNetwork.Endpoint {
if (queue.size < 20) {
queue += ForgeDirection.UNKNOWN -> packet.hop()
}
packet.data.headOption match {
case Some(answerPort: java.lang.Double) => queueMessage(packet.port, answerPort.toInt, packet.data.drop(1).toSeq)
case _ => queueMessage(packet.port, -1, packet.data.toSeq)
}
}
override protected def relayPacket(sourceSide: ForgeDirection, packet: Packet) {