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

small method rename and checking for ownership before starting a computer

Browse Source
This commit is contained in:
Florian Nücke 2013-11-26 03:05:16 +01:00
parent 34033966da
commit 9af202331b
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
li/cil/oc/api/network/Context.java
View File

@ -40,7 +40,7 @@ public interface Context {
* @param player the name of the player to check for. * @param player the name of the player to check for.
* @return whether the player with the specified name may use the computer. * @return whether the player with the specified name may use the computer.
*/ */
boolean isUser(String player); boolean canInteract(String player);
/** /**
* Whether the computer is currently in a running state, i.e. it is neither * Whether the computer is currently in a running state, i.e. it is neither

2
li/cil/oc/common/block/Case.scala
View File

@ -77,7 +77,7 @@ class Case(val parent: SimpleDelegator) extends Computer with SimpleDelegate {
override def onBlockRemovedBy(world: World, x: Int, y: Int, z: Int, player: EntityPlayer) = override def onBlockRemovedBy(world: World, x: Int, y: Int, z: Int, player: EntityPlayer) =
world.getBlockTileEntity(x, y, z) match { world.getBlockTileEntity(x, y, z) match {
case c: tileentity.Case if !world.isRemote => case c: tileentity.Case if !world.isRemote =>
c.computer.isUser(player.getCommandSenderName) c.computer.canInteract(player.getCommandSenderName)
case _ => super.onBlockRemovedBy(world, x, y, z, player) case _ => super.onBlockRemovedBy(world, x, y, z, player)
} }
} }

2
li/cil/oc/common/block/Computer.scala
View File

@ -28,7 +28,7 @@ abstract class Computer extends Delegate {
if (!player.isSneaking) { if (!player.isSneaking) {
if (!world.isRemote) { if (!world.isRemote) {
world.getBlockTileEntity(x, y, z) match { world.getBlockTileEntity(x, y, z) match {
case t: tileentity.Computer if !t.computer.isPaused => t.computer.start() case t: tileentity.Computer if !t.computer.isPaused && t.computer.canInteract(player.getCommandSenderName) => t.computer.start()
case _ => case _ =>
} }
} }

2
li/cil/oc/common/container/Case.scala
View File

@ -23,5 +23,5 @@ class Case(playerInventory: InventoryPlayer, `case`: tileentity.Case) extends Pl
addPlayerInventorySlots(8, 84) addPlayerInventorySlots(8, 84)
override def canInteractWith(player: EntityPlayer) = override def canInteractWith(player: EntityPlayer) =
super.canInteractWith(player) && `case`.computer.isUser(player.getCommandSenderName) super.canInteractWith(player) && `case`.computer.canInteract(player.getCommandSenderName)
} }

2
li/cil/oc/common/container/Robot.scala
View File

@ -20,5 +20,5 @@ class Robot(playerInventory: InventoryPlayer, robot: tileentity.Robot) extends P
addPlayerInventorySlots(8, 160) addPlayerInventorySlots(8, 160)
override def canInteractWith(player: EntityPlayer) = override def canInteractWith(player: EntityPlayer) =
super.canInteractWith(player) && robot.computer.isUser(player.getCommandSenderName) super.canInteractWith(player) && robot.computer.canInteract(player.getCommandSenderName)
} }

4
li/cil/oc/server/component/Computer.scala
View File

@ -87,7 +87,7 @@ class Computer(val owner: tileentity.Computer) extends ManagedComponent with Con
def address = node.address def address = node.address
def isUser(player: String) = !Settings.get.canComputersBeOwned || def canInteract(player: String) = !Settings.get.canComputersBeOwned ||
users.isEmpty || users.contains(player) || users.isEmpty || users.contains(player) ||
MinecraftServer.getServer.isSinglePlayer || MinecraftServer.getServer.isSinglePlayer ||
MinecraftServer.getServer.getConfigurationManager.isPlayerOpped(player) MinecraftServer.getServer.getConfigurationManager.isPlayerOpped(player)
@ -329,7 +329,7 @@ class Computer(val owner: tileentity.Computer) extends ManagedComponent with Con
case Array(name: String, args@_*) if message.name == "computer.signal" => case Array(name: String, args@_*) if message.name == "computer.signal" =>
signal(name, Seq(message.source.address) ++ args: _*) signal(name, Seq(message.source.address) ++ args: _*)
case Array(player: EntityPlayer, name: String, args@_*) if message.name == "computer.checked_signal" => case Array(player: EntityPlayer, name: String, args@_*) if message.name == "computer.checked_signal" =>
if (isUser(player.getCommandSenderName)) if (canInteract(player.getCommandSenderName))
signal(name, Seq(message.source.address) ++ args: _*) signal(name, Seq(message.source.address) ++ args: _*)
case _ => case _ =>
} }

2
reference.conf
View File

@ -314,7 +314,7 @@ opencomputers {
gpuCopy: 0.0050 gpuCopy: 0.0050
# The amount of energy it takes a robot to perform a 90 degree turn. # The amount of energy it takes a robot to perform a 90 degree turn.
robotTurn: 4.0 robotTurn: 5.0
# The amount of energy it takes a robot to move a single block. # The amount of energy it takes a robot to move a single block.
robotMove: 40.0 robotMove: 40.0