Merge branch 'refs/heads/master' into ver/1.20.2

# Conflicts: # build.gradle.kts
AzisabaNetwork · Aug 5, 2024 · 9866f9a · 9866f9a
2 parents 6438e2e + 4f7eedb
commit 9866f9a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 }
 
 group = "net.azisaba"
-version = "1.20.2+6.16.7"
+version = "1.20.2+6.16.8"
 
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(17))

diff --git a/src/main/java/com/github/mori01231/lifecore/command/LifeCoreUtilCommand.kt b/src/main/java/com/github/mori01231/lifecore/command/LifeCoreUtilCommand.kt
@@ -440,6 +440,24 @@ class LifeCoreUtilCommand(val plugin: LifeCore) : TabExecutor {
                 MapUtil.initializeMapRenderer((player as Player), player.inventory.itemInMainHand)
             }
         },
+        FixItem("displayタグを修正します") {
+            override fun execute(plugin: LifeCore, player: CommandSender, args: Array<String>) {
+                val item = (player as Player).inventory.itemInMainHand
+                val meta = item.itemMeta
+                if (meta.hasDisplayName()) {
+                    val origName = meta.displayName
+                    meta.setDisplayName(null)
+                    meta.setDisplayName(origName)
+                }
+                if (meta.hasLore()) {
+                    val origLore = meta.lore
+                    meta.lore = null
+                    meta.lore = origLore
+                }
+                item.itemMeta = meta
+                player.inventory.setItemInMainHand(item)
+            }
+        },
         ;
 
         abstract fun execute(plugin: LifeCore, player: CommandSender, args: Array<String>)

diff --git a/src/main/java/com/github/mori01231/lifecore/util/ItemUtil.java b/src/main/java/com/github/mori01231/lifecore/util/ItemUtil.java
@@ -147,6 +147,11 @@ public static ItemStack backupTag(@Nullable ItemStack stack) {
         if (stack == null || stack.getType().isAir()) return null;
         CompoundTag tag = CraftItemStack.asNMSCopy(stack).getTag();
         if (tag == null || tag.isEmpty()) return stack;
+        if (!tag.getCompound("backup").isEmpty()) return stack;
+        // exclude some items
+        if (tag.getCompound("PublicBukkitValues").getInt("minecraft:admin_item") == 1) {
+            return stack;
+        }
         return setTag(stack, "backup", tag);
     }