diff --git a/build.gradle.kts b/build.gradle.kts index 5411ef7..6e0eff7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,8 @@ plugins { `java-library` `maven-publish` - id("io.izzel.taboolib") version "1.42" - id("org.jetbrains.kotlin.jvm") version "1.5.10" + id("io.izzel.taboolib") version "1.54" + id("org.jetbrains.kotlin.jvm") version "1.8.0" } taboolib { @@ -24,9 +24,9 @@ taboolib { install("platform-bukkit") install("expansion-command-helper") classifier = null - version = "6.0.9-84" + version = "6.0.10-59" options("skit-kotlin") - relocate("kotlin","libs.kotlin1510") + relocate("kotlin","libs.kotlin180") } repositories { diff --git a/gradle.properties b/gradle.properties index 5e9496c..cc844a0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ group=com.github.xbaimiao.shoppro -version=1.1.0 +version=1.1.2 diff --git a/src/main/kotlin/com/github/xbaimiao/shoppro/core/shop/ShopImpl.kt b/src/main/kotlin/com/github/xbaimiao/shoppro/core/shop/ShopImpl.kt index 20a11c6..bdd6f44 100644 --- a/src/main/kotlin/com/github/xbaimiao/shoppro/core/shop/ShopImpl.kt +++ b/src/main/kotlin/com/github/xbaimiao/shoppro/core/shop/ShopImpl.kt @@ -20,6 +20,7 @@ import taboolib.platform.util.giveItem import taboolib.platform.util.hasItem import taboolib.platform.util.sendLang import taboolib.platform.util.takeItem +import java.util.concurrent.CopyOnWriteArrayList class ShopImpl(private val configuration: Configuration) : Shop() { @@ -82,7 +83,7 @@ class ShopImpl(private val configuration: Configuration) : Shop() { override fun open(player: Player) { player.openMenu(getTitle(player)) { rows(slots.size) - slots = ArrayList>().also { it.addAll(this@ShopImpl.slots) } + slots = CopyOnWriteArrayList>().also { it.addAll(this@ShopImpl.slots) } onClick { it.isCancelled = true } @@ -185,7 +186,11 @@ class ShopImpl(private val configuration: Configuration) : Shop() { return } if (ShopPro.database.getPlayerAlreadyData(player, item).sell + amount > item.limitPlayer) { - sell((item.limitPlayer - ShopPro.database.getPlayerAlreadyData(player, item).sell).toInt(), item, player) + sell( + (item.limitPlayer - ShopPro.database.getPlayerAlreadyData(player, item).sell).toInt(), + item, + player + ) return } if (ShopPro.database.getServerAlreadyData(item).sell + amount > item.limitServer) { diff --git a/src/main/kotlin/com/github/xbaimiao/shoppro/core/vault/DiyCurrency.kt b/src/main/kotlin/com/github/xbaimiao/shoppro/core/vault/DiyCurrency.kt index ffd36a8..8b9025b 100644 --- a/src/main/kotlin/com/github/xbaimiao/shoppro/core/vault/DiyCurrency.kt +++ b/src/main/kotlin/com/github/xbaimiao/shoppro/core/vault/DiyCurrency.kt @@ -62,7 +62,7 @@ class DiyCurrency(configuration: Configuration) : Currency { } val cmd = replace(takeCommand, player, double.format()) Bukkit.dispatchCommand(Bukkit.getConsoleSender(), cmd) - return false + return true } override fun getMoney(player: Player): Double {