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

Merge branch 'master-MC1.11' into master-MC1.12

Browse Source
This commit is contained in:
payonel 2018-09-29 17:39:11 -07:00
commit 497714b50b
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/scala/li/cil/oc/common/entity/Drone.scala
View File

@ -186,7 +186,13 @@ class Drone(world: World) extends Entity(world) with MachineHost with internal.D
override def isPaused: Boolean = machine.isPaused override def isPaused: Boolean = machine.isPaused
override def start(): Boolean = machine.start() override def start(): Boolean = {
if (world.isRemote || machine.isRunning) {
return false
}
preparePowerUp()
machine.start()
}
override def pause(seconds: Double): Boolean = machine.pause(seconds) override def pause(seconds: Double): Boolean = machine.pause(seconds)
@ -487,7 +493,6 @@ class Drone(world: World) extends Entity(world) with MachineHost with internal.D
} }
} }
else if (!world.isRemote && !machine.isRunning) { else if (!world.isRemote && !machine.isRunning) {
preparePowerUp()
start() start()
} }
} }

22
src/main/scala/li/cil/oc/server/component/NetworkCard.scala
View File

@ -173,16 +173,18 @@ class NetworkCard(val host: EnvironmentHost) extends AbstractManagedEnvironment
} }
// Accept wake-up messages regardless of port because we close all ports // Accept wake-up messages regardless of port because we close all ports
// when our computer shuts down. // when our computer shuts down.
packet.data match { val wakeup: Boolean = packet.data match {
case Array(message: Array[Byte]) if wakeMessage.contains(new String(message, Charsets.UTF_8)) => case Array(message: Array[Byte]) if wakeMessage.contains(new String(message, Charsets.UTF_8)) => true
node.sendToNeighbors("computer.start") case Array(message: String) if wakeMessage.contains(message) => true
case Array(message: String) if wakeMessage.contains(message) => case Array(message: Array[Byte], _*) if wakeMessageFuzzy && wakeMessage.contains(new String(message, Charsets.UTF_8)) => true
node.sendToNeighbors("computer.start") case Array(message: String, _*) if wakeMessageFuzzy && wakeMessage.contains(message) => true
case Array(message: Array[Byte], _*) if wakeMessageFuzzy && wakeMessage.contains(new String(message, Charsets.UTF_8)) => case _ => false
node.sendToNeighbors("computer.start") }
case Array(message: String, _*) if wakeMessageFuzzy && wakeMessage.contains(message) => if (wakeup) {
node.sendToNeighbors("computer.start") host match {
case _ => case ctx: Context => ctx.start()
case _ => node.sendToNeighbors("computer.start")
}
} }
} }
} }

3
src/main/scala/li/cil/oc/util/InventoryUtils.scala
View File

@ -135,7 +135,8 @@ object InventoryUtils {
(!stack.isEmpty && limit > 0 && stack.getCount > 0) && { (!stack.isEmpty && limit > 0 && stack.getCount > 0) && {
var amount = stack.getMaxStackSize min stack.getCount min limit var amount = stack.getMaxStackSize min stack.getCount min limit
inventory.extractItem(slot, amount, true) match { inventory.extractItem(slot, amount, true) match {
case extracted: ItemStack => case simExtracted: ItemStack =>
val extracted = simExtracted.copy
amount = extracted.getCount amount = extracted.getCount
consumer(extracted) consumer(extracted)
if(extracted.getCount >= amount) return false if(extracted.getCount >= amount) return false