diff options
Diffstat (limited to 'src/main/kotlin/io/dico/parcels2/util')
| -rw-r--r-- | src/main/kotlin/io/dico/parcels2/util/ext/Misc.kt | 4 | ||||
| -rw-r--r-- | src/main/kotlin/io/dico/parcels2/util/ext/Player.kt | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/main/kotlin/io/dico/parcels2/util/ext/Misc.kt b/src/main/kotlin/io/dico/parcels2/util/ext/Misc.kt index d7feabf..c09cd86 100644 --- a/src/main/kotlin/io/dico/parcels2/util/ext/Misc.kt +++ b/src/main/kotlin/io/dico/parcels2/util/ext/Misc.kt @@ -20,8 +20,8 @@ inline fun Boolean.alsoIfFalse(block: () -> Unit): Boolean = also { if (!it) blo inline fun <R> Any.synchronized(block: () -> R): R = synchronized(this, block) -inline fun <T> T?.isNullOr(condition: T.() -> Boolean): Boolean = this == null || condition() -inline fun <T> T?.isPresentAnd(condition: T.() -> Boolean): Boolean = this != null && condition() +//inline fun <T> T?.isNullOr(condition: T.() -> Boolean): Boolean = this == null || condition() +//inline fun <T> T?.isPresentAnd(condition: T.() -> Boolean): Boolean = this != null && condition() inline fun <T> T?.ifNullRun(block: () -> Unit): T? { if (this == null) block() return this diff --git a/src/main/kotlin/io/dico/parcels2/util/ext/Player.kt b/src/main/kotlin/io/dico/parcels2/util/ext/Player.kt index 83bcaf2..1d3117e 100644 --- a/src/main/kotlin/io/dico/parcels2/util/ext/Player.kt +++ b/src/main/kotlin/io/dico/parcels2/util/ext/Player.kt @@ -13,10 +13,14 @@ inline val OfflinePlayer.uuid get() = uniqueId inline val OfflinePlayer.isValid get() = isOnline() || hasPlayedBefore() -inline val Player.hasPermBanBypass get() = hasPermission("parcels.admin.bypass.ban") +const val PERM_BAN_BYPASS = "parcels.admin.bypass.ban" +const val PERM_BUILD_ANYWHERE = "parcels.admin.bypass.build" +const val PERM_ADMIN_MANAGE = "parcels.admin.manage" + +inline val Player.hasPermBanBypass get() = hasPermission(PERM_BAN_BYPASS) inline val Player.hasPermGamemodeBypass get() = hasPermission("parcels.admin.bypass.gamemode") -inline val Player.hasPermBuildAnywhere get() = hasPermission("parcels.admin.bypass.build") -inline val Player.hasPermAdminManage get() = hasPermission("parcels.admin.manage") +inline val Player.hasPermBuildAnywhere get() = hasPermission(PERM_BUILD_ANYWHERE) +inline val Player.hasPermAdminManage get() = hasPermission(PERM_ADMIN_MANAGE) inline val Player.hasParcelHomeOthers get() = hasPermission("parcels.command.home.others") inline val Player.hasPermRandomSpecific get() = hasPermission("parcels.command.random.specific") val Player.parcelLimit: Int |