diff --git a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java index 2153ffafb..890d15cf7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java @@ -678,8 +678,9 @@ public class GunEventHandler { // 三阶段 if ((tag.getInt("iterative") == 1 && tag.getInt("reload_stage") == 3) || tag.getBoolean("force_stage3_start")) { tag.putBoolean("force_stage3_start", false); - tag.putInt("finish", (int) tag.getDouble("finish_time") + 2); - player.getCooldowns().addCooldown(stack.getItem(), (int) tag.getDouble("finish_time") + 2); + int finishTime = GunsTool.getGunIntTag(stack, "FinishTime", 0); + tag.putInt("finish", finishTime + 2); + player.getCooldowns().addCooldown(stack.getItem(), finishTime + 2); playGunEndReloadSounds(player); } diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java index beb99b0f4..f8d089cbc 100644 --- a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java +++ b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java @@ -57,7 +57,7 @@ public class GunsTool { private static final Set STRING_SET = Set.of("EmptyReloadTime", "FireMode", "Weight", "SoundRadius", "BurstSize", "ProjectileAmount", "Spread", "NormalReloadTime", "Headshot", "Semi", "Burst", "Auto", "RecoilX", "RecoilY", "Velocity", "Damage", "BypassesArmor", "RPM", "Magazine", "MinZoom", "MaxZoom", "CustomZoom", "ExplosionDamage", "ExplosionRadius", "BoltActionTime", "ClipLoad", - "PrepareTime", "IterativeTime", "PrepareLoadTime"); + "PrepareTime", "IterativeTime", "PrepareLoadTime", "FinishTime"); public static void initGun(Level level, ItemStack stack, String location) { if (level.getServer() == null) return; diff --git a/src/main/resources/data/superbwarfare/guns/k_98.json b/src/main/resources/data/superbwarfare/guns/k_98.json index 1427dab1f..ce71a4b68 100644 --- a/src/main/resources/data/superbwarfare/guns/k_98.json +++ b/src/main/resources/data/superbwarfare/guns/k_98.json @@ -14,7 +14,7 @@ "ClipLoad": 1, "PrepareTime": 29, "IterativeTime": 11, - "finish_time": 18, + "FinishTime": 18, "BypassesArmor": 0.5, "SoundRadius": 18 } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/guns/m_870.json b/src/main/resources/data/superbwarfare/guns/m_870.json index a537ffdef..0302bcb45 100644 --- a/src/main/resources/data/superbwarfare/guns/m_870.json +++ b/src/main/resources/data/superbwarfare/guns/m_870.json @@ -13,7 +13,7 @@ "PrepareTime": 7, "PrepareLoadTime": 36, "IterativeTime": 16, - "finish_time": 12, + "FinishTime": 12, "BypassesArmor": 0.05, "SoundRadius": 16, "BoltActionTime": 11 diff --git a/src/main/resources/data/superbwarfare/guns/marlin.json b/src/main/resources/data/superbwarfare/guns/marlin.json index c20870207..9092f29d6 100644 --- a/src/main/resources/data/superbwarfare/guns/marlin.json +++ b/src/main/resources/data/superbwarfare/guns/marlin.json @@ -11,7 +11,7 @@ "Semi": 1, "PrepareTime": 7, "IterativeTime": 16, - "finish_time": 19, + "FinishTime": 19, "BypassesArmor": 0.3, "SoundRadius": 15, "BoltActionTime": 12 diff --git a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json index d6a4eec2f..ae6c88e90 100644 --- a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json +++ b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json @@ -14,7 +14,7 @@ "PrepareTime": 29, "prepare_empty": 16, "IterativeTime": 11, - "finish_time": 18, + "FinishTime": 18, "BypassesArmor": 0.54, "SoundRadius": 18 } \ No newline at end of file