Redstoner/Parcels
Archived
0
Fork 0
Code Activity

Fix privileges commands (cleanup)

Browse Source
This commit is contained in:
Dico
2018-09-24 08:57:42 +01:00
parent 68a0bb0539
commit 59e0cdda6d
4 changed files with 90 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/kotlin/io/dico/parcels2/Privilege.kt
View File

@@ -74,6 +74,12 @@ interface PrivilegesMinimal {
interface Privileges : PrivilegesMinimal {
val keyOfOwner: PlayerProfile.Real?
fun privilege(player: OfflinePlayer): Privilege {
val key = player.privilegeKey
return if (key == keyOfOwner) OWNER
else getStoredPrivilege(key)
}
fun privilege(player: OfflinePlayer, adminPerm: String): Privilege =
if (player is Player && player.hasPermission(adminPerm)) ADMIN
else {

5
src/main/kotlin/io/dico/parcels2/command/AbstractParcelCommands.kt
View File

@@ -4,6 +4,7 @@ import io.dico.dicore.command.*
import io.dico.parcels2.ParcelWorld
import io.dico.parcels2.ParcelsPlugin
import io.dico.parcels2.PlayerProfile
import io.dico.parcels2.PrivilegeChangeResult
import io.dico.parcels2.util.ext.hasPermAdminManage
import io.dico.parcels2.util.ext.parcelLimit
import org.bukkit.entity.Player
@@ -52,6 +53,10 @@ abstract class AbstractParcelCommands(val plugin: ParcelsPlugin) : ICommandRecei
}
}
protected fun err(message: String): Nothing = throw CommandException(message)
override fun getCoroutineContext() = plugin.coroutineContext
}

71
src/main/kotlin/io/dico/parcels2/command/CommandsPrivilegesGlobal.kt
View File

@@ -1,12 +1,11 @@
@file:Suppress("NON_EXHAUSTIVE_WHEN")
package io.dico.parcels2.command
import io.dico.dicore.command.Validate
import io.dico.dicore.command.annotation.Cmd
import io.dico.dicore.command.annotation.Desc
import io.dico.parcels2.GlobalPrivileges
import io.dico.parcels2.GlobalPrivilegesManager
import io.dico.parcels2.ParcelsPlugin
import io.dico.parcels2.PlayerProfile
import io.dico.parcels2.PrivilegeChangeResult.*
import org.bukkit.OfflinePlayer
import org.bukkit.entity.Player
@@ -19,11 +18,12 @@ class CommandsPrivilegesGlobal(plugin: ParcelsPlugin) : AbstractParcelCommands(p
"Allows a player to manage this parcel",
shortVersion = "allows a player to manage this parcel"
)
fun cmdEntrust(sender: Player, player: OfflinePlayer): Any? {
Validate.isTrue(player != sender, "The target cannot be yourself")
Validate.isTrue(data[sender].allowManage(player), "${player.name} is already allowed to manage globally")
return "${player.name} is now allowed to manage globally"
}
fun cmdEntrust(sender: Player, player: OfflinePlayer): Any? =
when (data[sender].allowManage(player)) {
FAIL_OWNER -> err("The target cannot be yourself")
FAIL -> err("${player.name} is already allowed to manage globally")
SUCCESS -> "${player.name} is now allowed to manage globally"
}
@Cmd("distrust")
@Desc(
@@ -31,10 +31,12 @@ class CommandsPrivilegesGlobal(plugin: ParcelsPlugin) : AbstractParcelCommands(p
"they will still be able to build",
shortVersion = "disallows a player to manage globally"
)
fun cmdDistrust(sender: Player, player: OfflinePlayer): Any? {
Validate.isTrue(data[sender].disallowManage(player), "${player.name} is not currently allowed to manage globally")
return "${player.name} is not allowed to manage globally anymore"
}
fun cmdDistrust(sender: Player, player: OfflinePlayer): Any? =
when (data[sender].disallowManage(player)) {
FAIL_OWNER -> err("The target cannot be yourself")
FAIL -> err("${player.name} is not currently allowed to manage globally")
SUCCESS -> "${player.name} is not allowed to manage globally anymore"
}
@Cmd("allow", aliases = ["add", "permit"])
@Desc(
@@ -42,11 +44,12 @@ class CommandsPrivilegesGlobal(plugin: ParcelsPlugin) : AbstractParcelCommands(p
"the parcels that you own.",
shortVersion = "globally allows a player to build on your parcels"
)
fun cmdAllow(sender: Player, player: OfflinePlayer): Any? {
Validate.isTrue(player != sender, "The target cannot be yourself")
Validate.isTrue(data[sender].allowBuild(player), "${player.name} is already allowed globally")
return "${player.name} is now allowed to build on all your parcels"
}
fun cmdAllow(sender: Player, player: OfflinePlayer): Any? =
when (data[sender].allowBuild(player)) {
FAIL_OWNER -> err("The target cannot be yourself")
FAIL -> err("${player.name} is already allowed globally")
SUCCESS -> "${player.name} is now allowed to build on all your parcels"
}
@Cmd("disallow", aliases = ["remove", "forbid"])
@Desc(
@@ -56,11 +59,12 @@ class CommandsPrivilegesGlobal(plugin: ParcelsPlugin) : AbstractParcelCommands(p
"parcels, they can still build there.",
shortVersion = "globally disallows a player to build on your parcels"
)
fun cmdDisallow(sender: Player, player: OfflinePlayer): Any? {
Validate.isTrue(player != sender, "The target cannot be yourself")
Validate.isTrue(data[sender].disallowBuild(player), "${player.name} is not currently allowed globally")
return "${player.name} is not allowed to build on all your parcels anymore"
}
fun cmdDisallow(sender: Player, player: OfflinePlayer): Any? =
when (data[sender].disallowBuild(player)) {
FAIL_OWNER -> err("The target cannot be yourself")
FAIL -> err("${player.name} is not currently allowed globally")
SUCCESS -> "${player.name} is not allowed to build on all your parcels anymore"
}
@Cmd("ban", aliases = ["deny"])
@Desc(
@@ -68,11 +72,12 @@ class CommandsPrivilegesGlobal(plugin: ParcelsPlugin) : AbstractParcelCommands(p
"that you own, making them unable to enter.",
shortVersion = "globally bans a player from your parcels"
)
fun cmdBan(sender: Player, player: OfflinePlayer): Any? {
Validate.isTrue(player != sender, "The target cannot be yourself")
Validate.isTrue(data[sender].ban(player), "${player.name} is already banned from all your parcels")
return "${player.name} is now banned from all your parcels"
}
fun cmdBan(sender: Player, player: OfflinePlayer): Any? =
when (data[sender].ban(player)) {
FAIL_OWNER -> err("The target cannot be yourself")
FAIL -> err("${player.name} is already banned from all your parcels")
SUCCESS -> "${player.name} is now banned from all your parcels"
}
@Cmd("unban", aliases = ["undeny"])
@Desc(
@@ -82,9 +87,11 @@ class CommandsPrivilegesGlobal(plugin: ParcelsPlugin) : AbstractParcelCommands(p
"they will still be banned there.",
shortVersion = "globally unbans a player from your parcels"
)
fun cmdUnban(sender: Player, player: OfflinePlayer): Any? {
Validate.isTrue(data[sender].unban(player), "${player.name} is not currently banned from all your parcels")
return "${player.name} is not banned from all your parcels anymore"
}
fun cmdUnban(sender: Player, player: OfflinePlayer): Any? =
when (data[sender].unban(player)) {
FAIL_OWNER -> err("The target cannot be yourself")
FAIL -> err("${player.name} is not currently banned from all your parcels")
SUCCESS -> "${player.name} is not banned from all your parcels anymore"
}
}

55
src/main/kotlin/io/dico/parcels2/command/CommandsPrivilegesLocal.kt
View File

@@ -5,6 +5,7 @@ import io.dico.dicore.command.annotation.Cmd
import io.dico.dicore.command.annotation.Desc
import io.dico.parcels2.ParcelsPlugin
import io.dico.parcels2.Privilege
import io.dico.parcels2.PrivilegeChangeResult.*
import io.dico.parcels2.util.ext.hasPermAdminManage
import org.bukkit.OfflinePlayer
import org.bukkit.entity.Player
@@ -19,9 +20,12 @@ class CommandsPrivilegesLocal(plugin: ParcelsPlugin) : AbstractParcelCommands(pl
@RequireParcelPrivilege(Privilege.OWNER)
fun ParcelScope.cmdEntrust(sender: Player, player: OfflinePlayer): Any? {
Validate.isTrue(parcel.owner != null || sender.hasPermAdminManage, "This parcel is unowned")
Validate.isTrue(!parcel.owner!!.matches(player), "The target already owns the parcel")
Validate.isTrue(parcel.allowManage(player), "${player.name} is already allowed to manage this parcel")
return "${player.name} is now allowed to manage this parcel"
return when (parcel.allowManage(player)) {
FAIL_OWNER -> err("The target already owns the parcel")
FAIL -> err("${player.name} is already allowed to manage this parcel")
SUCCESS -> "${player.name} is now allowed to manage this parcel"
}
}
@Cmd("distrust")
@@ -32,8 +36,13 @@ class CommandsPrivilegesLocal(plugin: ParcelsPlugin) : AbstractParcelCommands(pl
)
@RequireParcelPrivilege(Privilege.OWNER)
fun ParcelScope.cmdDistrust(sender: Player, player: OfflinePlayer): Any? {
Validate.isTrue(parcel.disallowManage(player), "${player.name} is not currently allowed to manage this parcel")
return "${player.name} is not allowed to manage this parcel anymore"
Validate.isTrue(parcel.owner != null || sender.hasPermAdminManage, "This parcel is unowned")
return when (parcel.disallowManage(player)) {
FAIL_OWNER -> err("The target owns the parcel and can't be distrusted")
FAIL -> err("${player.name} is not currently allowed to manage this parcel")
SUCCESS -> "${player.name} is not allowed to manage this parcel anymore"
}
}
@Cmd("allow", aliases = ["add", "permit"])
@@ -44,10 +53,13 @@ class CommandsPrivilegesLocal(plugin: ParcelsPlugin) : AbstractParcelCommands(pl
@RequireParcelPrivilege(Privilege.CAN_MANAGE)
fun ParcelScope.cmdAllow(sender: Player, player: OfflinePlayer): Any? {
Validate.isTrue(parcel.owner != null || sender.hasPermAdminManage, "This parcel is unowned")
Validate.isTrue(!parcel.owner!!.matches(player), "The target already owns the parcel")
Validate.isTrue(parcel.privilege(sender) > parcel.privilege(player), "You may not change the privilege of ${player.name}")
Validate.isTrue(parcel.allowBuild(player), "${player.name} is already allowed to build on this parcel")
return "${player.name} is now allowed to build on this parcel"
return when (parcel.allowBuild(player)) {
FAIL_OWNER -> err("The target already owns the parcel")
FAIL -> err("${player.name} is already allowed to build on this parcel")
SUCCESS -> "${player.name} is now allowed to build on this parcel"
}
}
@Cmd("disallow", aliases = ["remove", "forbid"])
@@ -58,9 +70,14 @@ class CommandsPrivilegesLocal(plugin: ParcelsPlugin) : AbstractParcelCommands(pl
)
@RequireParcelPrivilege(Privilege.CAN_MANAGE)
fun ParcelScope.cmdDisallow(sender: Player, player: OfflinePlayer): Any? {
Validate.isTrue(parcel.owner != null || sender.hasPermAdminManage, "This parcel is unowned")
Validate.isTrue(parcel.privilege(sender) > parcel.privilege(player), "You may not change the privilege of ${player.name}")
Validate.isTrue(parcel.disallowBuild(player), "${player.name} is not currently allowed to build on this parcel")
return "${player.name} is not allowed to build on this parcel anymore"
return when (parcel.disallowBuild(player)) {
FAIL_OWNER -> err("The target owns the parcel")
FAIL -> err("${player.name} is not currently allowed to build on this parcel")
SUCCESS -> "${player.name} is not allowed to build on this parcel anymore"
}
}
@Cmd("ban", aliases = ["deny"])
@@ -72,10 +89,13 @@ class CommandsPrivilegesLocal(plugin: ParcelsPlugin) : AbstractParcelCommands(pl
@RequireParcelPrivilege(Privilege.CAN_MANAGE)
fun ParcelScope.cmdBan(sender: Player, player: OfflinePlayer): Any? {
Validate.isTrue(parcel.owner != null || sender.hasPermAdminManage, "This parcel is unowned")
Validate.isTrue(!parcel.owner!!.matches(player), "The owner cannot be banned from the parcel")
Validate.isTrue(parcel.privilege(sender) > parcel.privilege(player), "You may not change the privilege of ${player.name}")
Validate.isTrue(parcel.ban(player), "${player.name} is already banned from this parcel")
return "${player.name} is now banned from this parcel"
return when (parcel.disallowBuild(player)) {
FAIL_OWNER -> err("The target owns the parcel")
FAIL -> err("${player.name} is already banned from this parcel")
SUCCESS -> "${player.name} is now banned from this parcel"
}
}
@Cmd("unban", aliases = ["undeny"])
@@ -86,9 +106,14 @@ class CommandsPrivilegesLocal(plugin: ParcelsPlugin) : AbstractParcelCommands(pl
)
@RequireParcelPrivilege(Privilege.CAN_MANAGE)
fun ParcelScope.cmdUnban(sender: Player, player: OfflinePlayer): Any? {
Validate.isTrue(parcel.owner != null || sender.hasPermAdminManage, "This parcel is unowned")
Validate.isTrue(parcel.privilege(sender) > parcel.privilege(player), "You may not change the privilege of ${player.name}")
Validate.isTrue(parcel.unban(player), "${player.name} is not currently banned from this parcel")
return "${player.name} is not banned from this parcel anymore"
return when (parcel.disallowBuild(player)) {
FAIL_OWNER -> err("The target owns the parcel")
FAIL -> err("${player.name} is not currently banned from this parcel")
SUCCESS -> "${player.name} is not banned from this parcel anymore"
}
}
}