diff --git a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java index daa9e6303..52ddce4bf 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java @@ -60,9 +60,7 @@ public class GunEventHandler { var stack = data.stack(); if (stack.is(ModTags.Items.NORMAL_GUN)) { - if (data.bolt.actionTimer.get() > 0) { - data.bolt.actionTimer.reduce(); - } + data.bolt.actionTimer.reduce(); if (stack.getItem() == ModItems.MARLIN.get() && data.bolt.actionTimer.get() == 9) { data.isEmpty.set(false); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java index fc57a60b6..ada52c252 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/special/TaserItem.java @@ -257,7 +257,6 @@ public class TaserItem extends GunItem implements GeoItem, SpecialFireWeapon, En } data.ammo.set(data.ammo.get() - 1); - data.tag().putBoolean("shoot", true); energyStorage.extractEnergy(400 + 100 * perkLevel, false); } diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/send/FireMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/send/FireMessage.java index c4282e5a3..c7fbc0fc5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/send/FireMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/send/FireMessage.java @@ -85,8 +85,7 @@ public record FireMessage(int msgType, double power, boolean zoom) implements Cu if (data.defaultActionTime() > 0 && data.ammo.get() > (stack.is(ModTags.Items.REVOLVER) ? -1 : 0) && data.bolt.actionTimer.get() == 0 - && !(data.reload.normal() - || data.reload.empty()) + && !(data.reload.normal() || data.reload.empty()) && !data.reloading() && !data.charging() ) {