Skip to content

回滚nbt组件操作,把兼容操作忘了 #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Micalhl merged 1 commit into from
Feb 2, 2026
Merged

回滚nbt组件操作,把兼容操作忘了 #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ukkit-nms-tag/bukkit-nms-tag-12005/src/main/kotlin/taboolib/module/nms/NMSItemTag12005.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ class NMSItemTag12005 : NMSItemTag() {
}

// 不支持的类型
else -> ItemComponent.instance.getTagData(nbtTag) ?: error("Unsupported type: ${nbtTag::class.java}}")
else -> error("Unsupported type: ${nbtTag::class.java}}")
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...ukkit-nms-tag/bukkit-nms-tag-12105/src/main/kotlin/taboolib/module/nms/NMSItemTag12105.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ class NMSItemTag12105 : NMSItemTag() {
override fun getItemTag(itemStack: ItemStack, onlyCustom: Boolean): ItemTag {
val nmsItem = getNMSCopy(itemStack)
return if (onlyCustom) {
val a = any.filter { nmsItem.get(it) != null }.map { it.toString() to itemTagToBukkitCopy(nmsItem.get(it)!!, true) }
ItemTag(a.associate { it.first to it.second })
val tag = nmsItem.get(DataComponents.CUSTOM_DATA)?.copyTag()
if (tag != null) itemTagToBukkitCopy(tag).asCompound() else ItemTag()
} else {
val tag = nmsItem.save(CraftRegistry.getMinecraftRegistry())
if (tag != null) itemTagToBukkitCopy(tag, true).asCompound() else ItemTag12105() // 返回一个特殊的 ItemTag
Expand Down Expand Up @@ -217,7 +217,7 @@ class NMSItemTag12105 : NMSItemTag() {
is Boolean -> ItemTagData(nbtTag)

// 不支持的类型
else -> ItemComponent.instance.getTagData(nbtTag) ?: error("Unsupported type: ${nbtTag::class.java}}")
else -> error("Unsupported type: ${nbtTag::class.java}}")
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions ...ukkit-nms-tag/bukkit-nms-tag-12106/src/main/kotlin/taboolib/module/nms/NMSItemTag12106.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ class NMSItemTag12106 : NMSItemTag() {
override fun getItemTag(itemStack: ItemStack, onlyCustom: Boolean): ItemTag {
val nmsItem = getNMSCopy(itemStack)
return if (onlyCustom) {
val filter = components.filter { nmsItem.get(it) != null }.map { it.toString() to itemTagToBukkitCopy(nmsItem.get(it)!!, true) }
ItemTag(filter.associate { it.first to it.second })
val tag = nmsItem.get(DataComponents.CUSTOM_DATA)?.copyTag()
if (tag != null) itemTagToBukkitCopy(tag).asCompound() else ItemTag()
} else {
val tag = nmsItem.toNbt()
if (tag != null) itemTagToBukkitCopy(tag).asCompound() else ItemTag12106() // 返回一个特殊的 ItemTag
if (tag != null) itemTagToBukkitCopy(tag, true).asCompound() else ItemTag12106() // 返回一个特殊的 ItemTag
}
}

Expand Down Expand Up @@ -220,7 +220,7 @@ class NMSItemTag12106 : NMSItemTag() {
is Boolean -> ItemTagData(nbtTag)

// 不支持的类型
else -> ItemComponent.instance.getTagData(nbtTag) ?: error("Unsupported type: ${nbtTag::class.java}")
else -> error("Unsupported type: ${nbtTag::class.java}")
}
}

Expand Down
Loading