From c912e271a683d7b36b89cb7b2529f912e2d13c3d Mon Sep 17 00:00:00 2001 From: Light_Quanta Date: Tue, 15 Apr 2025 21:49:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DM134=E5=BC=B9=E8=8D=AF?= =?UTF-8?q?=E6=B6=88=E8=80=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../atsuishio/superbwarfare/event/ClientEventHandler.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java index 13ef361cd..b76185eb7 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java @@ -591,7 +591,7 @@ public class ClientEventHandler { && !player.isSprinting() && tag.getDouble("overheat") == 0 && !player.getCooldowns().isOnCooldown(stack.getItem()) && miniGunRot >= 20 - && (cap.rifleAmmo > 0 || InventoryTool.hasCreativeAmmoBox(player)) + && data.hasAmmo(player) ))) { if (mode == 0) { if (clientTimer.getProgress() == 0) { @@ -705,7 +705,7 @@ public class ClientEventHandler { handleClientShoot(); } } else if (stack.is(ModItems.MINIGUN.get())) { - if (player.getData(ModAttachments.PLAYER_VARIABLE).rifleAmmo > 0 || InventoryTool.hasCreativeAmmoBox(player)) { + if (data.hasAmmo(player)) { var perk = data.perk.get(Perk.Type.AMMO); float pitch = tag.getDouble("heat") <= 40 ? 1 : (float) (1 - 0.025 * Math.abs(40 - tag.getDouble("heat"))); @@ -824,7 +824,6 @@ public class ClientEventHandler { } else { player.playSound(ModSounds.SHELL_CASING_NORMAL.get(), (float) Math.max(1.5 - 0.2 * shooterHeight, 0), (float) ((2 * org.joml.Math.random() - 1) * 0.05f + 1.0f)); } - } }); }