SteamWar/SteamWar
9
1
Fork 0
Code Issues 50 Pull Requests 12 Packages Projects 3 Releases Wiki Activity

Cleanup DealerInventory and TNTLeagueConfig

Browse Source
This commit is contained in:
YoyoNow
2024-12-22 22:22:42 +01:00
parent aaa808f90f
commit 89fe401b03
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
TNTLeague/src/de/steamwar/tntleague/config/TNTLeagueConfig.kt
View File

@@ -24,11 +24,9 @@ import org.bukkit.Material
import org.bukkit.configuration.ConfigurationSection import org.bukkit.configuration.ConfigurationSection
import org.bukkit.configuration.file.FileConfiguration import org.bukkit.configuration.file.FileConfiguration
import org.bukkit.enchantments.Enchantment import org.bukkit.enchantments.Enchantment
import org.bukkit.inventory.ItemStack
import org.bukkit.inventory.meta.BookMeta
import org.bukkit.inventory.meta.Damageable import org.bukkit.inventory.meta.Damageable
import org.bukkit.inventory.meta.ItemMeta import org.bukkit.inventory.meta.ItemMeta
import java.util.UUID import java.util.*
data class TNTLeagueConfig( data class TNTLeagueConfig(
val startDelay: Int = 10, val startDelay: Int = 10,
@@ -74,21 +72,17 @@ data class TNTLeagueConfig(
ANGLES; ANGLES;
} }
enum class ItemExtra(val func: (item: ItemMeta) -> ItemMeta) { enum class ItemExtra(val func: (item: ItemMeta) -> Unit) {
ONESHOT({ ONESHOT({
if (it is Damageable) { if (it is Damageable) {
it.damage = 384 it.damage = 384
} }
it
}), }),
FLAME({ FLAME({
it.addEnchant(Enchantment.FLAME, 1, false) it.addEnchant(Enchantment.FLAME, 1, false)
it
}), }),
UNBREAKING({ UNBREAKING({
it.addEnchant(Enchantment.UNBREAKING, 1, false) it.addEnchant(Enchantment.UNBREAKING, 1, false)
it
}) })
} }
} }

3
TNTLeague/src/de/steamwar/tntleague/inventory/DealerInventory.kt
View File

@@ -37,7 +37,6 @@ import org.bukkit.inventory.Inventory
import org.bukkit.inventory.ItemStack import org.bukkit.inventory.ItemStack
import org.bukkit.persistence.PersistentDataType import org.bukkit.persistence.PersistentDataType
import java.util.* import java.util.*
import kotlin.math.ceil
class DealerInventory(val player: Player): SWInventoryHolder() { class DealerInventory(val player: Player): SWInventoryHolder() {
@@ -83,7 +82,7 @@ class DealerInventory(val player: Player): SWInventoryHolder() {
} }
team.coins -= price team.coins -= price
player.inventory.addItem(ItemStack.of(item.first.type, amount).also { item.second.extras.forEach { extra -> it.itemMeta = extra.func(it.itemMeta) } }) player.inventory.addItem(ItemStack.of(item.first.type, amount).apply { item.second.extras.forEach { itemMeta = itemMeta.apply(it.func) } })
} }
private val items by lazy { private val items by lazy {