From 618992aa7c26b98f8f88d2525b975286e5a1d1ca Mon Sep 17 00:00:00 2001
From: C-H716 <1536152356@qq.com>
Date: Thu, 13 Nov 2025 21:54:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=8A=A0=E9=80=9F=E5=8D=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4=E4=B8=BA2x=EF=BC=8C?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E5=87=BA=E7=8E=B01x=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../upgrades/EntitySpeedCardItem.java         | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/extendedae_plus/ae/definitions/upgrades/EntitySpeedCardItem.java b/src/main/java/com/extendedae_plus/ae/definitions/upgrades/EntitySpeedCardItem.java
index cc97d98..f896d7e 100644
--- a/src/main/java/com/extendedae_plus/ae/definitions/upgrades/EntitySpeedCardItem.java
+++ b/src/main/java/com/extendedae_plus/ae/definitions/upgrades/EntitySpeedCardItem.java
@@ -33,11 +33,20 @@ public class EntitySpeedCardItem extends UpgradeCardItem {
     }
 
     public static int readMultiplier(ItemStack stack) {
-        if (stack == null || stack.isEmpty()) return 1;
-        CompoundTag t = stack.getTag();
-        if (t == null) return 1;
-        int v = t.getInt(NBT_MULTIPLIER);
-        return v <= 0 ? 1 : v;
+        if (stack == null || stack.isEmpty()) return 2;
+        CompoundTag tag = stack.getTag();
+        if (tag == null || !tag.contains(NBT_MULTIPLIER)) {
+            // 关键：检测到没有 NBT，直接强制写一个默认合法值
+            CompoundTag newTag = stack.getOrCreateTag();
+            newTag.putInt(NBT_MULTIPLIER, 2);
+            return 2;
+        }
+        int v = tag.getInt(NBT_MULTIPLIER);
+        // 合法性检查
+        return switch (v) {
+            case 2, 4, 8, 16 -> v;
+            default -> 2; // 非法值一律纠正为 x2
+        };
     }
 
     @Override
@@ -54,8 +63,7 @@ public class EntitySpeedCardItem extends UpgradeCardItem {
         return Component.translatable(key);
     }
 
-
-    public List<Component> getTooltipLines(ItemStack stack) {
+    private List<Component> getTooltipLines(ItemStack stack) {
         int mult = readMultiplier(stack);
         long cap = 1L;
         switch (mult) {
@@ -76,6 +84,4 @@ public class EntitySpeedCardItem extends UpgradeCardItem {
         // add our custom tooltip lines (multiplier and max)
         lines.addAll(this.getTooltipLines(stack));
     }
-}
-
-
+}
\ No newline at end of file