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

Fixed server racks and MCUs actually having a node on the front face that just was never used internally.

Browse Source
This commit is contained in:
Florian Nücke 2015-09-13 13:27:48 +02:00
parent 71cc2b8c7e
commit db9b373d12
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,8 @@ class Microcontroller extends traits.PowerAcceptor with traits.Hub with traits.C
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
override def canConnect(side: ForgeDirection) = side != facing override def canConnect(side: ForgeDirection) = side != facing
override def sidedNode(side: ForgeDirection): Node = if (side != facing) super.sidedNode(side) else null
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
override protected def hasConnector(side: ForgeDirection) = side != facing override protected def hasConnector(side: ForgeDirection) = side != facing
@ -173,7 +175,7 @@ class Microcontroller extends traits.PowerAcceptor with traits.Hub with traits.C
override def onMessage(message: Message): Unit = { override def onMessage(message: Message): Unit = {
if (message.source.network == snooperNode.network) { if (message.source.network == snooperNode.network) {
for (side <- ForgeDirection.VALID_DIRECTIONS if outputSides(side.ordinal)) { for (side <- ForgeDirection.VALID_DIRECTIONS if outputSides(side.ordinal) && side != facing) {
sidedNode(side).sendToReachable(message.name, message.data: _*) sidedNode(side).sendToReachable(message.name, message.data: _*)
} }
} }

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

@ -74,6 +74,8 @@ class ServerRack extends traits.PowerAcceptor with traits.Hub with traits.PowerB
override def canConnect(side: ForgeDirection) = side != facing override def canConnect(side: ForgeDirection) = side != facing
override def sidedNode(side: ForgeDirection): Node = if (side != facing) super.sidedNode(side) else null
@Method(modid = Mods.IDs.StargateTech2) @Method(modid = Mods.IDs.StargateTech2)
override def getInterfaces(side: Int) = if (side != facing.ordinal) { override def getInterfaces(side: Int) = if (side != facing.ordinal) {
super.getInterfaces(side) super.getInterfaces(side)
@ -133,7 +135,7 @@ class ServerRack extends traits.PowerAcceptor with traits.Hub with traits.PowerB
sides(number) match { sides(number) match {
case Some(serverSide) => case Some(serverSide) =>
val serverNode = server.machine.node val serverNode = server.machine.node
for (side <- ForgeDirection.VALID_DIRECTIONS) { for (side <- ForgeDirection.VALID_DIRECTIONS if side != facing) {
if (toLocal(side) == serverSide) sidedNode(side).connect(serverNode) if (toLocal(side) == serverSide) sidedNode(side).connect(serverNode)
else sidedNode(side).disconnect(serverNode) else sidedNode(side).disconnect(serverNode)
} }

2
src/main/scala/li/cil/oc/common/tileentity/traits/PowerBalancer.scala
View File

@ -62,6 +62,6 @@ trait PowerBalancer extends PowerInformation with SidedEnvironment {
private def isPrimary(connector: Connector) = { private def isPrimary(connector: Connector) = {
val nodes = connectors val nodes = connectors
connector != null && nodes(nodes.indexWhere(_.network == connector.network)) == connector connector != null && nodes(nodes.indexWhere(node => node != null && node.network == connector.network)) == connector
} }
} }