From 74d20d84836c7f23b7ed21af665a71158426a257 Mon Sep 17 00:00:00 2001
From: XiaoMoMi <972454774@qq.com>
Date: Sun, 9 Nov 2025 14:59:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E9=98=B2=E6=9C=AA=E5=90=AF=E7=94=A8?=
 =?UTF-8?q?=E5=9F=BA=E4=BA=8E=E7=BA=B9=E9=A5=B0=E7=9B=94=E7=94=B2=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=94=81=E9=93=BE=E7=94=B2=E4=BA=A7=E7=94=9F=E7=9A=84?=
 =?UTF-8?q?=E7=BD=91=E7=BB=9C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../item/factory/ComponentItemFactory1_20_5.java  | 15 +++++++++++----
 .../resources/resources/legacy_armor/pack.yml     |  4 +---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/ComponentItemFactory1_20_5.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/ComponentItemFactory1_20_5.java
index 7a24b32f8..01539c1b0 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/ComponentItemFactory1_20_5.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/ComponentItemFactory1_20_5.java
@@ -501,10 +501,17 @@ public class ComponentItemFactory1_20_5 extends BukkitItemFactory<ComponentItemW
         if (trim == null) {
             item.resetComponent(DataComponentTypes.TRIM);
         } else {
-            item.setJavaComponent(DataComponentTypes.TRIM, Map.of(
-                    "pattern", trim.pattern().asString(),
-                    "material", trim.material().asString()
-            ));
+            try {
+                item.setJavaComponent(DataComponentTypes.TRIM, Map.of(
+                        "pattern", trim.pattern().asString(),
+                        "material", trim.material().asString()
+                ));
+            } catch (Exception e) {
+                // 预防未启用基于纹饰盔甲时，锁链甲可能产生的网络问题（由用户配置决定）
+                if (!trim.material().equals(Key.of("minecraft", "custom")) && !trim.pattern().equals(Key.of("minecraft", "chainmail"))) {
+                    this.plugin.logger().warn("Failed to apply trim " + trim, e);
+                }
+            }
         }
     }
 
diff --git a/common-files/src/main/resources/resources/legacy_armor/pack.yml b/common-files/src/main/resources/resources/legacy_armor/pack.yml
index f73b20dc9..86e3cb1cf 100644
--- a/common-files/src/main/resources/resources/legacy_armor/pack.yml
+++ b/common-files/src/main/resources/resources/legacy_armor/pack.yml
@@ -2,6 +2,4 @@ author: XiaoMoMi
 version: 0.0.1
 description: Fix broken vanilla armor
 namespace: minecraft
-enable:
-  $$>=1.21.2: false
-  $$<1.21.2: true
+enable: false