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

Merge pull request #1562 from magik6k/patch-netcards

Browse Source 
[1.6] Fixed network card message target for servers
This commit is contained in:
Florian "Sangar" Nücke 2015-12-16 08:43:49 +01:00
commit 19c286c84f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/scala/li/cil/oc/server/component/NetworkCard.scala
View File

@ -5,6 +5,7 @@ import li.cil.oc.Settings
import li.cil.oc.api import li.cil.oc.api
import li.cil.oc.api.Network import li.cil.oc.api.Network
import li.cil.oc.api.component.RackBusConnectable import li.cil.oc.api.component.RackBusConnectable
import li.cil.oc.api.internal.Rack
import li.cil.oc.api.machine.Arguments import li.cil.oc.api.machine.Arguments
import li.cil.oc.api.machine.Callback import li.cil.oc.api.machine.Callback
import li.cil.oc.api.machine.Context import li.cil.oc.api.machine.Context
@ -98,13 +99,15 @@ class NetworkCard(val host: EnvironmentHost) extends prefab.ManagedEnvironment w
result(oldMessage.orNull, oldFuzzy) result(oldMessage.orNull, oldFuzzy)
} }
protected def doSend(packet: Packet) { protected def doSend(packet: Packet) = host match {
node.sendToReachable("network.message", packet) case _: Rack => node.sendToNeighbors("network.message", packet)
} case _ => node.sendToReachable("network.message", packet)
}
protected def doBroadcast(packet: Packet) { protected def doBroadcast(packet: Packet) = host match {
node.sendToReachable("network.message", packet) case _: Rack => node.sendToNeighbors("network.message", packet)
} case _ => node.sendToReachable("network.message", packet)
}
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //