Merge pull request #596 from Score2/dev/6.2.3

Bkm016 · web-flow · commit 65309315743a · 2025-07-15T17:50:42.000+08:00
Restore the process method of CustomModelData on ItemBuilder
diff --git a/module/bukkit/bukkit-util/src/main/kotlin/taboolib/platform/util/ItemBuilder.kt b/module/bukkit/bukkit-util/src/main/kotlin/taboolib/platform/util/ItemBuilder.kt
@@ -296,11 +296,8 @@ open class ItemBuilder {
         }
         // CustomModelData
         try {
-            // 1.21.5+ 必须判断 hasCustomModelData() 否则报错
-            if (itemMeta.hasCustomModelData()) {
-                if (customModelData != -1) {
-                    itemMeta.setCustomModelData(customModelData)
-                }
+            if (customModelData != -1) {
+                itemMeta.setCustomModelData(customModelData)
             }
         } catch (_: NoSuchMethodError) {
         }

Original file line number	Diff line number	Diff line change
`@@ -296,11 +296,8 @@ open class ItemBuilder {`
`296`	`296`	`}`
`297`	`297`	`// CustomModelData`
`298`	`298`	`try {`
`299`		`- // 1.21.5+ 必须判断 hasCustomModelData() 否则报错`
`300`		`- if (itemMeta.hasCustomModelData()) {`
`301`		`- if (customModelData != -1) {`
`302`		`- itemMeta.setCustomModelData(customModelData)`
`303`		`- }`
	`299`	`+ if (customModelData != -1) {`
	`300`	`+ itemMeta.setCustomModelData(customModelData)`
`304`	`301`	`}`
`305`	`302`	`} catch (_: NoSuchMethodError) {`
`306`	`303`	`}`