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);