禁止在酒吧点炒饭(恼)
This commit is contained in:
parent
cb43fade3e
commit
f2fc7943e1
2 changed files with 3 additions and 5 deletions
|
@ -301,6 +301,7 @@ public class GunData {
|
||||||
public double recoilY() {
|
public double recoilY() {
|
||||||
return defaultGunData().recoilY;
|
return defaultGunData().recoilY;
|
||||||
}
|
}
|
||||||
|
|
||||||
public double recoil() {
|
public double recoil() {
|
||||||
return defaultGunData().recoil;
|
return defaultGunData().recoil;
|
||||||
}
|
}
|
||||||
|
@ -334,7 +335,7 @@ public class GunData {
|
||||||
}
|
}
|
||||||
|
|
||||||
public int rpm() {
|
public int rpm() {
|
||||||
return (defaultGunData().rpm + item.getCustomRPM(stack));
|
return Mth.clamp(defaultGunData().rpm + item.getCustomRPM(stack), 1, 114514);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int burstAmount() {
|
public int burstAmount() {
|
||||||
|
|
|
@ -545,10 +545,7 @@ public class ClientEventHandler {
|
||||||
cantFireTime = Mth.clamp(cantFireTime - 6 * speed * times, 0, 40);
|
cantFireTime = Mth.clamp(cantFireTime - 6 * speed * times, 0, 40);
|
||||||
}
|
}
|
||||||
|
|
||||||
int rpm = data.rpm() + customRpm;
|
int rpm = Mth.clamp(data.rpm() + customRpm, 1, 114514);
|
||||||
if (rpm == 0) {
|
|
||||||
rpm = 600;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (Perk.Type type : Perk.Type.values()) {
|
for (Perk.Type type : Perk.Type.values()) {
|
||||||
var instance = data.perk.getInstance(type);
|
var instance = data.perk.getInstance(type);
|
||||||
|
|
Loading…
Add table
Reference in a new issue