Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9

This commit is contained in:
Florian Nücke 2016-04-02 16:29:33 +02:00
commit ed4451122b

View File

@ -49,7 +49,7 @@ class WirelessNetworkCard(host: EnvironmentHost) extends NetworkCard(host) with
@Callback(doc = """function(strength:number):number -- Set the signal strength (range) used when sending messages.""")
def setStrength(context: Context, args: Arguments): Array[AnyRef] = {
strength = math.max(args.checkDouble(0), math.min(0, Settings.get.maxWirelessRange))
strength = math.max(0, math.min(args.checkDouble(0), Settings.get.maxWirelessRange))
result(strength)
}
@ -118,4 +118,4 @@ class WirelessNetworkCard(host: EnvironmentHost) extends NetworkCard(host) with
super.save(nbt)
nbt.setDouble("strength", strength)
}
}
}