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

Merge branch 'master-MC1.7.10' into master-MC1.10

Browse Source
This commit is contained in:
payonel 2019-06-12 00:51:02 -07:00
commit bed66723a7
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala
View File

@ -138,12 +138,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
@ -162,17 +162,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