fix: trash bug

AzisabaNetwork · Jun 11, 2024 · a1a553b · a1a553b
1 parent 1649e14
commit a1a553b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "net.azisaba"
-version = "6.10.1"
+version = "6.10.2"
 
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(8))

diff --git a/src/main/java/com/github/mori01231/lifecore/TrashInventory.kt b/src/main/java/com/github/mori01231/lifecore/TrashInventory.kt
@@ -2,21 +2,25 @@ package com.github.mori01231.lifecore
 
 import com.github.mori01231.lifecore.util.ItemUtil
 import org.bukkit.Bukkit
+import org.bukkit.ChatColor
 import org.bukkit.Material
 import org.bukkit.inventory.Inventory
 import org.bukkit.inventory.InventoryHolder
 import org.bukkit.inventory.ItemStack
 
 class TrashInventory : InventoryHolder {
-    private val inventory = Bukkit.createInventory(this, 54, "ゴミ箱")
-
-    init {
-        val item = ItemUtil.createItemStack(Material.BARRIER, 1) {
+    companion object {
+        val trashItem = ItemUtil.createItemStack(Material.BARRIER, 1) {
             it.itemMeta = it.itemMeta.apply {
-                setDisplayName("ゴミを捨てる")
+                setDisplayName("${ChatColor.RED}ゴミを捨てる")
             }
         }
-        inventory.setItem(53, item)
+    }
+
+    private val inventory = Bukkit.createInventory(this, 54, "ゴミ箱")
+
+    init {
+        inventory.setItem(53, trashItem)
     }
 
     override fun getInventory(): Inventory {

diff --git a/src/main/java/com/github/mori01231/lifecore/listener/TrashListener.kt b/src/main/java/com/github/mori01231/lifecore/listener/TrashListener.kt
@@ -6,9 +6,7 @@ import com.github.mori01231.lifecore.util.ItemUtil
 import org.bukkit.Bukkit
 import org.bukkit.ChatColor
 import org.bukkit.Material
-import org.bukkit.entity.Player
 import org.bukkit.event.EventHandler
-import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
 import org.bukkit.event.inventory.InventoryClickEvent
 import org.bukkit.event.inventory.InventoryCloseEvent
@@ -68,9 +66,9 @@ class TrashListener(private val plugin: LifeCore) : Listener {
         if (e.inventory.holder is TrashInventory) {
             val inv = e.inventory
             for (item in inv.contents) {
-                if (item.type != Material.AIR) {
-                    e.player.inventory.addItem(item)
-                }
+                @Suppress("SENSELESS_COMPARISON")
+                if (item == null || item.type.isAir) continue
+                e.player.inventory.addItem(item)
             }
         }
     }