From 64da14cc9f807e3fa56328d8d8b759a2e85c2309 Mon Sep 17 00:00:00 2001 From: Shynixn Date: Mon, 22 Jul 2024 18:13:02 +0200 Subject: [PATCH] #33 Fixed signs and joining permission. --- build.gradle.kts | 6 +++--- .../commandexecutor/MCTennisCommandExecutor.kt | 18 +++++++++--------- src/main/resources/plugin-legacy.yml | 2 +- src/main/resources/plugin.yml | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 856f858..56fd9c6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "com.github.shynixn" -version = "1.6.0" +version = "1.6.1" repositories { mavenCentral() @@ -40,8 +40,8 @@ dependencies { // Custom dependencies implementation("com.github.shynixn.mcutils:common:2024.19") implementation("com.github.shynixn.mcutils:guice:2024.2") - implementation("com.github.shynixn.mcutils:packet:2024.30") - implementation("com.github.shynixn.mcutils:sign:2024.2") + implementation("com.github.shynixn.mcutils:packet:2024.32") + implementation("com.github.shynixn.mcutils:sign:2024.3") // Test testImplementation(kotlin("test")) diff --git a/src/main/kotlin/com/github/shynixn/mctennis/impl/commandexecutor/MCTennisCommandExecutor.kt b/src/main/kotlin/com/github/shynixn/mctennis/impl/commandexecutor/MCTennisCommandExecutor.kt index ea3d5f9..773c656 100644 --- a/src/main/kotlin/com/github/shynixn/mctennis/impl/commandexecutor/MCTennisCommandExecutor.kt +++ b/src/main/kotlin/com/github/shynixn/mctennis/impl/commandexecutor/MCTennisCommandExecutor.kt @@ -37,7 +37,7 @@ class MCTennisCommandExecutor @Inject constructor( ) { private val fallBackPrefix: String = org.bukkit.ChatColor.BLUE.toString() + "[MCTennis] " + org.bukkit.ChatColor.WHITE - private val arenaTabs: suspend (s : CommandSender) -> List = { + private val arenaTabs: suspend (s: CommandSender) -> List = { arenaRepository.getAll().map { e -> e.name } } private val coroutineExecutor = object : CoroutineExecutor { @@ -190,25 +190,25 @@ class MCTennisCommandExecutor @Inject constructor( subCommand("join") { noPermission() builder().argument("name").validator(gameMustExistValidator).tabs(arenaTabs) - .executePlayer({MCTennisLanguage.commandSenderHasToBePlayer}) { sender, arena -> + .executePlayer({ MCTennisLanguage.commandSenderHasToBePlayer }) { sender, arena -> joinGame( sender, arena.name ) }.argument("team").validator(teamValidator).tabs { listOf("red", "blue") } - .executePlayer({MCTennisLanguage.commandSenderHasToBePlayer}) { sender, arena, team -> + .executePlayer({ MCTennisLanguage.commandSenderHasToBePlayer }) { sender, arena, team -> joinGame(sender, arena.name, team) } } subCommand("leave") { noPermission() - builder().executePlayer({MCTennisLanguage.commandSenderHasToBePlayer}) { sender -> leaveGame(sender) } + builder().executePlayer({ MCTennisLanguage.commandSenderHasToBePlayer }) { sender -> leaveGame(sender) } } helpCommand() subCommand("location") { permission(Permission.EDIT_GAME) builder().argument("name").validator(gameMustExistValidator).tabs(arenaTabs) .argument("type").validator(locationTypeValidator).tabs { LocationType.values().map { e -> e.id } } - .executePlayer({MCTennisLanguage.commandSenderHasToBePlayer}) { player, arena, locationType -> + .executePlayer({ MCTennisLanguage.commandSenderHasToBePlayer }) { player, arena, locationType -> setLocation(player, arena, locationType) } } @@ -216,7 +216,7 @@ class MCTennisCommandExecutor @Inject constructor( permission(Permission.EDIT_GAME) builder().argument("name").validator(gameMustExistValidator).tabs(arenaTabs) .argument("team").validator(teamMetaValidator).tabs { listOf("red", "blue") } - .executePlayer({MCTennisLanguage.commandSenderHasToBePlayer}) { player, arena, meta -> + .executePlayer({ MCTennisLanguage.commandSenderHasToBePlayer }) { player, arena, meta -> setInventory(player, arena, meta) } } @@ -224,7 +224,7 @@ class MCTennisCommandExecutor @Inject constructor( permission(Permission.EDIT_GAME) builder().argument("name").validator(gameMustExistValidator).tabs(arenaTabs) .argument("team").validator(teamMetaValidator).tabs { listOf("red", "blue") } - .executePlayer({MCTennisLanguage.commandSenderHasToBePlayer}) { player, arena, meta -> + .executePlayer({ MCTennisLanguage.commandSenderHasToBePlayer }) { player, arena, meta -> setArmor(player, arena, meta) } } @@ -232,7 +232,7 @@ class MCTennisCommandExecutor @Inject constructor( permission(Permission.EDIT_GAME) builder().argument("name").validator(gameMustExistValidator).tabs(arenaTabs) .argument("type").validator(signTypeValidator).tabs { listOf("join", "leave") } - .executePlayer({MCTennisLanguage.commandSenderHasToBePlayer}) { player, arena, signType -> + .executePlayer({ MCTennisLanguage.commandSenderHasToBePlayer }) { player, arena, signType -> setSign(player, arena, signType) } } @@ -351,7 +351,7 @@ class MCTennisCommandExecutor @Inject constructor( return } - if (!player.hasPermission("mctennis.join.${game.arena.name}")) { + if (!player.hasPermission("mctennis.join.${game.arena.name}") && !player.hasPermission("mctennis.join.*")) { player.sendMessage(MCTennisLanguage.noPermissionForGameMessage.format(game.arena.name)) return } diff --git a/src/main/resources/plugin-legacy.yml b/src/main/resources/plugin-legacy.yml index 490a467..5817150 100644 --- a/src/main/resources/plugin-legacy.yml +++ b/src/main/resources/plugin-legacy.yml @@ -1,5 +1,5 @@ name: MCTennis -version: 1.6.0 +version: 1.6.1 author: Shynixn website: https://www.spigotmc.org/members/shynixn.63455/ main: com.github.shynixn.mctennis.MCTennisPlugin diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 36b192e..7aedcc6 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: MCTennis -version: 1.6.0 +version: 1.6.1 author: Shynixn website: https://www.spigotmc.org/members/shynixn.63455/ main: com.github.shynixn.mctennis.MCTennisPlugin