Fix the problem with not being able to limit the number of players pr…

…operly and support up to 8 players.
RaceAssist · Feb 25, 2022 · d98967c · d98967c
1 parent 13f407e
commit d98967c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -105,7 +105,7 @@ bukkit {
     permissions {
         register("RaceAssist.admin") {
             default = Default.OP
-            childrenMap = mapOf("RaceAssist.commands.*" to true)
+            children = listOf("RaceAssist.commands.*")
         }
         register("RaceAssist.user") {
             default = Default.TRUE

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/bet/gui/BetChestGui.kt b/src/main/kotlin/dev/nikomaru/raceassist/bet/gui/BetChestGui.kt
@@ -42,13 +42,16 @@ class BetChestGui {
 
     suspend fun getGUI(player: Player, raceId: String): Inventory {
         val gui = Bukkit.createInventory(player, 45, GuiComponent.guiComponent())
-        val playerWools = ImmutableList.of(Material.RED_WOOL,
+        val playerWools = ImmutableList.of(
+            Material.RED_WOOL,
             Material.BLUE_WOOL,
             Material.YELLOW_WOOL,
             Material.GREEN_WOOL,
             Material.BROWN_WOOL,
             Material.PINK_WOOL,
-            Material.WHITE_WOOL)
+            Material.WHITE_WOOL,
+            Material.ORANGE_WOOL,
+        )
         val players: ArrayList<UUID> = ArrayList()
         val odds: HashMap<UUID, Double> = HashMap()
         var sum = 0

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/race/commands/player/PlayerAddCommand.kt b/src/main/kotlin/dev/nikomaru/raceassist/race/commands/player/PlayerAddCommand.kt
@@ -55,7 +55,7 @@ class PlayerAddCommand {
                 sender.sendMessage(Lang.getComponent("already-exist-this-user", sender.locale()))
                 return@launch
             }
-            if (getRacePlayerAmount() >= 8) {
+            if (getRacePlayerAmount(raceId) > 7) {
                 sender.sendMessage(Lang.getComponent("max-player-is-eight", sender.locale()))
                 return@launch
             }

diff --git a/src/main/kotlin/dev/nikomaru/raceassist/utils/CommandUtils.kt b/src/main/kotlin/dev/nikomaru/raceassist/utils/CommandUtils.kt
@@ -261,9 +261,9 @@ object CommandUtils {
         RaceList.select { RaceList.raceId eq raceId }.firstOrNull()?.get(RaceList.reverse)
     }
 
-    suspend fun getRacePlayerAmount(): Long = newSuspendedTransaction {
+    suspend fun getRacePlayerAmount(raceId: String): Long = newSuspendedTransaction {
         PlayerList.select {
-            PlayerList.raceId eq "raceId"
+            PlayerList.raceId eq raceId
         }.count()
     }