From 7737a64c796f82590c93bbcc485a864e0a56fd87 Mon Sep 17 00:00:00 2001 From: payonel Date: Wed, 12 Jun 2019 00:48:23 -0700 Subject: [PATCH] fixed t2 wireless cards NOT getting wired msgs closes #3102 --- .../server/component/WirelessNetworkCard.scala | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala b/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala index 120d9ebda..587dd1f7e 100644 --- a/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala +++ b/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala @@ -133,12 +133,12 @@ abstract class WirelessNetworkCard(host: EnvironmentHost) extends NetworkCard(ho object WirelessNetworkCard { class Tier1(host: EnvironmentHost) extends WirelessNetworkCard(host) { - override protected def wirelessCostPerRange = Settings.get.wirelessCostPerRange(Tier.One) + override protected def wirelessCostPerRange: Double = Settings.get.wirelessCostPerRange(Tier.One) - override protected def maxWirelessRange = Settings.get.maxWirelessRange(Tier.One) + override protected def maxWirelessRange: Double = Settings.get.maxWirelessRange(Tier.One) // wired network card is before wireless cards in max port list - override protected def maxOpenPorts = Settings.get.maxOpenPorts(Tier.One + 1) + override protected def maxOpenPorts: Int = Settings.get.maxOpenPorts(Tier.One + 1) override protected def shouldSendWiredTraffic = false @@ -157,17 +157,18 @@ object WirelessNetworkCard { override def getDeviceInfo: util.Map[String, String] = deviceInfo - override protected def isPacketAccepted(packet: Packet, distance: Double) = distance != 0 && super.isPacketAccepted(packet, distance) - + override protected def isPacketAccepted(packet: Packet, distance: Double): Boolean = { + (shouldSendWiredTraffic || distance == 0) && super.isPacketAccepted(packet, distance) + } } class Tier2(host: EnvironmentHost) extends Tier1(host) { - override protected def wirelessCostPerRange = Settings.get.wirelessCostPerRange(Tier.Two) + override protected def wirelessCostPerRange: Double = Settings.get.wirelessCostPerRange(Tier.Two) - override protected def maxWirelessRange = Settings.get.maxWirelessRange(Tier.Two) + override protected def maxWirelessRange: Double = Settings.get.maxWirelessRange(Tier.Two) // wired network card is before wireless cards in max port list - override protected def maxOpenPorts = Settings.get.maxOpenPorts(Tier.Two + 1) + override protected def maxOpenPorts: Int = Settings.get.maxOpenPorts(Tier.Two + 1) override protected def shouldSendWiredTraffic = true