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

Increase "duration" to keep potion effects at to make stuff work that needs time to activate (such as nausea and nightvision), make it instantly stop on disabling instead.

Browse Source 
Fixed onEnable/onDisable callbacks.
This commit is contained in:
Florian Nücke 2015-09-18 00:04:36 +02:00
parent fab26fb92c
commit a8c145e071
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,7 +282,6 @@ class ControllerImpl(val player: EntityPlayer) extends Controller with WirelessE
private def cleanActiveBehaviors(): Unit = { private def cleanActiveBehaviors(): Unit = {
if (activeBehaviorsDirty) { if (activeBehaviorsDirty) {
configuration.synchronized(if (activeBehaviorsDirty) { configuration.synchronized(if (activeBehaviorsDirty) {
activeBehaviors.clear()
val newBehaviors = configuration.behaviors.filter(_.isActive).map(_.behavior) val newBehaviors = configuration.behaviors.filter(_.isActive).map(_.behavior)
val addedBehaviors = newBehaviors -- activeBehaviors val addedBehaviors = newBehaviors -- activeBehaviors
val removedBehaviors = activeBehaviors -- newBehaviors val removedBehaviors = activeBehaviors -- newBehaviors

11
src/main/scala/li/cil/oc/common/nanomachines/provider/PotionProvider.scala
View File

@ -40,7 +40,7 @@ object PotionProvider extends SimpleProvider {
} }
class PotionBehavior(val potion: Potion, player: EntityPlayer) extends SimpleBehavior(player) { class PotionBehavior(val potion: Potion, player: EntityPlayer) extends SimpleBehavior(player) {
final val RefreshInterval = 40 final val Duration = 600
def amplifier(player: EntityPlayer) = api.Nanomachines.getController(player).getInputCount(this) - 1 def amplifier(player: EntityPlayer) = api.Nanomachines.getController(player).getInputCount(this) - 1
@ -48,13 +48,12 @@ object PotionProvider extends SimpleProvider {
override def onEnable(): Unit = {} override def onEnable(): Unit = {}
override def onDisable(): Unit = {} override def onDisable(): Unit = {
player.removePotionEffect(potion.id)
}
override def update(): Unit = { override def update(): Unit = {
player.getActivePotionEffect(potion) match { player.addPotionEffect(new PotionEffect(potion.id, Duration, amplifier(player)))
case effect: PotionEffect if effect.getDuration > RefreshInterval / 2 => // Effect still active.
case _ => player.addPotionEffect(new PotionEffect(potion.id, RefreshInterval, amplifier(player)))
}
} }
} }