From 0e12bd4950be25ad19e3e9ac67034dc9cc06db26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E7=99=BD?= <67080574+xbaimiao@users.noreply.github.com> Date: Sat, 10 Sep 2022 18:32:44 +0800 Subject: [PATCH] fix bugs --- .../xbaimiao/shoppro/core/item/ItemsAdderShopItem.kt | 10 ---------- .../github/xbaimiao/shoppro/core/vault/VaultImpl.kt | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/main/kotlin/com/github/xbaimiao/shoppro/core/item/ItemsAdderShopItem.kt b/src/main/kotlin/com/github/xbaimiao/shoppro/core/item/ItemsAdderShopItem.kt index 24fb3f2..867520c 100644 --- a/src/main/kotlin/com/github/xbaimiao/shoppro/core/item/ItemsAdderShopItem.kt +++ b/src/main/kotlin/com/github/xbaimiao/shoppro/core/item/ItemsAdderShopItem.kt @@ -4,7 +4,6 @@ import com.github.xbaimiao.shoppro.core.shop.Shop import org.bukkit.Material import org.bukkit.inventory.ItemStack import taboolib.library.xseries.XMaterial -import taboolib.module.nms.getItemTag class ItemsAdderShopItem( override val key: Char, @@ -23,13 +22,11 @@ class ItemsAdderShopItem( val custom: Int - private var customPotionColor: Int? = null init { iaMaterial.split(":").let { strings -> material = XMaterial.matchXMaterial(strings[1]).get().parseMaterial()!! custom = strings[2].toInt() - strings.getOrNull(3)?.let { customPotionColor = it.toInt() } } } @@ -48,13 +45,6 @@ class ItemsAdderShopItem( this.name = this@ItemsAdderShopItem.name this.lore.addAll(this@ItemsAdderShopItem.lore) this.customModelData = custom - }.also { item -> - customPotionColor?.let { - val tag = item.getItemTag() - tag.putDeep("meta.CustomPotionColor.data", it) - tag.putDeep("meta.CustomPotionColor.type", "INT") - tag.saveTo(item) - } } } diff --git a/src/main/kotlin/com/github/xbaimiao/shoppro/core/vault/VaultImpl.kt b/src/main/kotlin/com/github/xbaimiao/shoppro/core/vault/VaultImpl.kt index 8965f39..a23d6ad 100644 --- a/src/main/kotlin/com/github/xbaimiao/shoppro/core/vault/VaultImpl.kt +++ b/src/main/kotlin/com/github/xbaimiao/shoppro/core/vault/VaultImpl.kt @@ -23,7 +23,7 @@ object VaultImpl : Vault { } override fun getMoney(player: Player): Double { - return VaultService.economy!!.getBalance(player) + return VaultService.economy!!.getBalance(player).format() }