Skip to content

Commit ab16068

Browse files
better error text
1 parent dfd9a4b commit ab16068

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

src/main/kotlin/de/randombyte/commandutils/alias/CommandListener.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,23 @@ class CommandListener(
1818
fun onCommand(event: SendCommandEvent, @First commandSource: CommandSource) {
1919
val wholeCommand = event.wholeCommand
2020
val matchedAliasedMap = configAccessor.get().alias.aliases.mapNotNull { (alias, aliasConfig) ->
21-
aliasConfig to (AliasParser.parse(alias, wholeCommand) ?: return@mapNotNull null)
21+
(alias to aliasConfig) to (AliasParser.parse(alias, wholeCommand) ?: return@mapNotNull null)
2222
}.toList()
2323

2424
if (matchedAliasedMap.isEmpty()) return // doesn't match any of our aliases
2525

2626
if (matchedAliasedMap.size > 1) {
27-
val matchedAliasesString = matchedAliasedMap.joinToString(separator = ", ", prefix = "[", postfix = "]", transform = { "'$it'" })
28-
logger.error("More than alias matched! command: '$wholeCommand'; matched aliases: $matchedAliasesString")
27+
val matchedAliasesString = matchedAliasedMap.joinToString(separator = ", ", prefix = "[", postfix = "]", transform = { "'${it.first.first}'" })
28+
logger.error("More than one alias matched! command: '$wholeCommand'; matched aliases: $matchedAliasesString")
2929
throw IllegalArgumentException("More than one alias matched, report to admin!")
3030
}
3131

32-
val (aliasConfig, arguments) = matchedAliasedMap.single()
32+
val (aliasEntry, arguments) = matchedAliasedMap.single()
33+
val (_, aliasConfig) = aliasEntry
34+
if (!commandSource.hasPermission(aliasConfig.permission)) {
35+
throw RuntimeException("You don't have the permission to execute this command!")
36+
}
37+
3338
aliasConfig.commands.forEach {
3439
var modifiedWholeCommand = it
3540
arguments.forEach { (parameter, argument) -> modifiedWholeCommand = modifiedWholeCommand.replace(parameter, argument) }

0 commit comments

Comments
 (0)