diff --git a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java
index 88961fc28..b54dff1d1 100644
--- a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java
+++ b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java
@@ -821,9 +821,8 @@ public class GunEventHandler {
      */
     private static void handleSentinelCharge(Player player) {
         ItemStack stack = player.getMainHandItem();
-        CompoundTag tag = stack.getOrCreateTag();
         // 启动换弹
-        if (tag.getBoolean("start_sentinel_charge")) {
+        if (GunsTool.getGunBooleanTag(stack, "StartCharge")) {
             GunsTool.setGunIntTag(stack, "ChargeTime", 127);
             GunsTool.setGunBooleanTag(stack, "Charging", true);
 
@@ -832,7 +831,7 @@ public class GunEventHandler {
                 SoundTool.playLocalSound(serverPlayer, sound1p, 2f, 1f);
             }
 
-            tag.putBoolean("start_sentinel_charge", false);
+            GunsTool.setGunBooleanTag(stack, "StartCharge", false);
         }
 
         if (GunsTool.getGunIntTag(stack, "ChargeTime", 0) > 0) {
diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/FireModeMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/FireModeMessage.java
index 8e9ab263a..f023ff940 100644
--- a/src/main/java/com/atsuishio/superbwarfare/network/message/FireModeMessage.java
+++ b/src/main/java/com/atsuishio/superbwarfare/network/message/FireModeMessage.java
@@ -108,7 +108,7 @@ public class FireModeMessage {
                         );
 
                         if (flag.get()) {
-                            tag.putBoolean("start_sentinel_charge", true);
+                            GunsTool.setGunBooleanTag(stack, "StartCharge", true);
                         }
                     }
                 }