Merge pull request #34 from Shynixn/development

Merge changes to master --release
Shynixn · Jul 22, 2024 · 32a85f9 · 32a85f9
2 parents c42a1ed + 64da14c
commit 32a85f9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git 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
@@ -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<String> = {
+    private val arenaTabs: suspend (s: CommandSender) -> List<String> = {
         arenaRepository.getAll().map { e -> e.name }
     }
     private val coroutineExecutor = object : CoroutineExecutor {
@@ -190,49 +190,49 @@ 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)
                     }
             }
             subCommand("inventory") {
                 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)
                     }
             }
             subCommand("armor") {
                 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)
                     }
             }
             subCommand("sign") {
                 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
@@ -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
@@ -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