From f2fc7943e1b67766d8e08a9072e77bdc8fa1e6a6 Mon Sep 17 00:00:00 2001 From: Light_Quanta Date: Tue, 8 Jul 2025 23:18:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=81=E6=AD=A2=E5=9C=A8=E9=85=92=E5=90=A7?= =?UTF-8?q?=E7=82=B9=E7=82=92=E9=A5=AD=EF=BC=88=E6=81=BC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/atsuishio/superbwarfare/data/gun/GunData.java | 3 ++- .../atsuishio/superbwarfare/event/ClientEventHandler.java | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/data/gun/GunData.java b/src/main/java/com/atsuishio/superbwarfare/data/gun/GunData.java index bc7385b2d..a4f36eafd 100644 --- a/src/main/java/com/atsuishio/superbwarfare/data/gun/GunData.java +++ b/src/main/java/com/atsuishio/superbwarfare/data/gun/GunData.java @@ -301,6 +301,7 @@ public class GunData { public double recoilY() { return defaultGunData().recoilY; } + public double recoil() { return defaultGunData().recoil; } @@ -334,7 +335,7 @@ public class GunData { } public int rpm() { - return (defaultGunData().rpm + item.getCustomRPM(stack)); + return Mth.clamp(defaultGunData().rpm + item.getCustomRPM(stack), 1, 114514); } public int burstAmount() { diff --git a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java index eaf31e529..99c042954 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java @@ -545,10 +545,7 @@ public class ClientEventHandler { cantFireTime = Mth.clamp(cantFireTime - 6 * speed * times, 0, 40); } - int rpm = data.rpm() + customRpm; - if (rpm == 0) { - rpm = 600; - } + int rpm = Mth.clamp(data.rpm() + customRpm, 1, 114514); for (Perk.Type type : Perk.Type.values()) { var instance = data.perk.getInstance(type);