diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java index 0230e0cb2..d575f4cc1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/GunItem.java @@ -203,9 +203,6 @@ public abstract class GunItem extends Item implements CustomRendererItem { perk.reduceCooldown(ModPerks.FOURTH_TIMES_CHARM, "FourthTimesCharmTick"); - perk.reduceCooldown(ModPerks.DESPERADO, "DesperadoTime"); - perk.reduceCooldown(ModPerks.DESPERADO, "DesperadoTimePost"); - if (perk.getLevel(ModPerks.FOURTH_TIMES_CHARM) > 0) { var tag = data.perk.getTag(ModPerks.FOURTH_TIMES_CHARM); int count = perk.getTag(ModPerks.FOURTH_TIMES_CHARM).getInt("FourthTimesCharmCount"); diff --git a/src/main/java/com/atsuishio/superbwarfare/perk/damage/Desperado.java b/src/main/java/com/atsuishio/superbwarfare/perk/damage/Desperado.java index b3fcfbc1e..8ae4e1032 100644 --- a/src/main/java/com/atsuishio/superbwarfare/perk/damage/Desperado.java +++ b/src/main/java/com/atsuishio/superbwarfare/perk/damage/Desperado.java @@ -14,10 +14,16 @@ public class Desperado extends Perk { super("desperado", Perk.Type.DAMAGE); } + @Override + public void tick(GunData data, PerkInstance instance, @Nullable LivingEntity living) { + data.perk.reduceCooldown(this, "DesperadoTime"); + data.perk.reduceCooldown(this, "DesperadoTimePost"); + } + @Override public int getModifiedRPM(int rpm, GunData data, PerkInstance instance) { if (data.perk.getTag(this).getInt("DesperadoTimePost") > 0) { - return rpm * (int) (1.285 + 0.015 * instance.level()); + return (int) (rpm * (1.285 + 0.015 * instance.level())); } return super.getModifiedRPM(rpm, data, instance); }