From eacae09e4f94d69601ea345ae643440117a27452 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Mon, 20 Jan 2025 16:46:53 +0100 Subject: [PATCH] Fix TNTLeague --- KotlinCore/src/de/steamwar/kotlin/KotlinInventory.kt | 5 ++--- .../src/de/steamwar/tntleague/inventory/CategoryInventory.kt | 3 ++- .../src/de/steamwar/tntleague/inventory/DealerInventory.kt | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/KotlinCore/src/de/steamwar/kotlin/KotlinInventory.kt b/KotlinCore/src/de/steamwar/kotlin/KotlinInventory.kt index 3c5f0ae2..54798c49 100644 --- a/KotlinCore/src/de/steamwar/kotlin/KotlinInventory.kt +++ b/KotlinCore/src/de/steamwar/kotlin/KotlinInventory.kt @@ -22,14 +22,13 @@ package de.steamwar.kotlin import de.steamwar.inventory.SWInventory import org.bukkit.entity.Player import org.bukkit.event.inventory.InventoryClickEvent -import org.bukkit.inventory.Inventory import org.bukkit.inventory.ItemStack abstract class KotlinInventory(val player: Player) { - private val inv: SWInventory by lazy { SWInventory(player) { createInventory() } } + private val inv: SWInventory by lazy { createInventory() } - abstract fun createInventory(): Inventory + abstract fun createInventory(): SWInventory fun open() = inv.open() diff --git a/TNTLeague/src/de/steamwar/tntleague/inventory/CategoryInventory.kt b/TNTLeague/src/de/steamwar/tntleague/inventory/CategoryInventory.kt index dcf1d690..76200073 100644 --- a/TNTLeague/src/de/steamwar/tntleague/inventory/CategoryInventory.kt +++ b/TNTLeague/src/de/steamwar/tntleague/inventory/CategoryInventory.kt @@ -19,6 +19,7 @@ package de.steamwar.tntleague.inventory +import de.steamwar.inventory.SWInventory import de.steamwar.kotlin.KotlinInventory import de.steamwar.tntleague.config.TNTLeagueConfig import de.steamwar.tntleague.inventory.DealerInventory.Companion.buyItem @@ -30,7 +31,7 @@ import org.bukkit.entity.Player import org.bukkit.inventory.Inventory class CategoryInventory(player: Player, category: TNTLeagueConfig.ItemCategory): KotlinInventory(player) { - override fun createInventory(): Inventory = Bukkit.createInventory(null, 9 * 6, Component.text(message.parse("DEALER", player))) + override fun createInventory() = SWInventory(player, 9 * 6, message.parse("DEALER", player)) init { itemsByCategory[category]!!.forEachIndexed { index, item -> diff --git a/TNTLeague/src/de/steamwar/tntleague/inventory/DealerInventory.kt b/TNTLeague/src/de/steamwar/tntleague/inventory/DealerInventory.kt index 384699d1..418c15fb 100644 --- a/TNTLeague/src/de/steamwar/tntleague/inventory/DealerInventory.kt +++ b/TNTLeague/src/de/steamwar/tntleague/inventory/DealerInventory.kt @@ -41,8 +41,6 @@ import java.util.* class DealerInventory(player: Player): KotlinInventory(player) { - private val inv: SWInventory = SWInventory(player) { createInventory() } - init { this[10] = SWItem(Material.REDSTONE_BLOCK, message.parse("DEALER_REDSTONE", player)).itemStack to openCategory(TNTLeagueConfig.ItemCategory.REDSTONE) this[12] = SWItem(Material.END_STONE, message.parse("DEALER_BLOCKS", player)).itemStack to openCategory(TNTLeagueConfig.ItemCategory.BLOCKS) @@ -56,7 +54,7 @@ class DealerInventory(player: Player): KotlinInventory(player) { private fun openCategory(cat: TNTLeagueConfig.ItemCategory): (e: InventoryClickEvent) -> Unit = { CategoryInventory(player, cat).open() } - override fun createInventory(): Inventory = plugin.server.createInventory(null, 6 * 9, Component.text(message.parse("DEALER", player))) + override fun createInventory() = SWInventory(player, 9 * 6, message.parse("DEALER", player)) companion object { private val priceKey = NamespacedKey(plugin, "price")