github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-25 15:40:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/reborn' into reborn

Browse Source
This commit is contained in:
Him188 2020-05-19 16:08:43 +08:00
commit 8ee378cd1b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandPermission.kt
View File

@ -95,7 +95,7 @@ interface CommandPermission {
*/
object Console : CommandPermission {
override fun CommandSender.hasPermission(): Boolean = false
}
object Default : CommandPermission by (Manager or Console)
}
@ -117,7 +117,6 @@ inline fun CommandSender.hasPermission(permission: CommandPermission): Boolean =
inline fun CommandPermission.testPermission(sender: CommandSender): Boolean = this.run { sender.hasPermission() }
internal class OrCommandPermission(
private val first: CommandPermission,
private val second: CommandPermission
@ -127,6 +126,7 @@ internal class OrCommandPermission(
}
}
internal class AndCommandPermission(
private val first: CommandPermission,
private val second: CommandPermission