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

Corrected use of max safe input config option.

Browse Source
This commit is contained in:
Florian Nücke 2015-09-18 01:26:31 +02:00
parent 9a07f854eb
commit fc8e14ff5c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/Settings.scala
View File

@ -354,7 +354,7 @@ class Settings(val config: Config) {
val nanomachineConnectorQuota = config.getDouble("nanomachines.connectorQuota") max 0
val nanomachineMaxInputs = config.getInt("nanomachines.maxInputs") max 1
val nanomachineMaxOutputs = config.getInt("nanomachines.maxOutputs") max 1
val nanomachinesSafeInputCount = config.getDouble("nanomachines.safeInputCount") max 0 min 1
val nanomachinesSafeInputCount = config.getInt("nanomachines.safeInputCount") max 0
val nanomachineReconfigureTimeout = config.getDouble("nanomachines.reconfigureCooldown") max 0
val nanomachineMagnetRange = config.getDouble("nanomachines.magnetRange") max 0
val nanomachineDisintegrationRange = config.getInt("nanomachines.disintegrationRange") max 0

2
src/main/scala/li/cil/oc/common/nanomachines/ControllerImpl.scala
View File

@ -142,7 +142,7 @@ class ControllerImpl(val player: EntityPlayer) extends Controller with WirelessE
override def getTotalInputCount: Int = configuration.synchronized(configuration.triggers.length)
override def getSafeInputCount: Int = configuration.synchronized(configuration.triggers.length * Settings.get.nanomachinesSafeInputCount).toInt
override def getSafeInputCount: Int = Settings.get.nanomachinesSafeInputCount
override def getInput(index: Int): Boolean = configuration.synchronized(configuration.triggers(index).isActive)