From 92c88386139c52c674c61e3e2e389cbca055caf9 Mon Sep 17 00:00:00 2001 From: Light_Quanta Date: Tue, 15 Apr 2025 23:31:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8D=A2=E5=BC=B9=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../network/message/send/ReloadMessage.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/send/ReloadMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/send/ReloadMessage.java index ff2a41539..ceb855cb8 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/send/ReloadMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/send/ReloadMessage.java @@ -2,10 +2,8 @@ package com.atsuishio.superbwarfare.network.message.send; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.init.ModAttachments; -import com.atsuishio.superbwarfare.init.ModItems; import com.atsuishio.superbwarfare.item.gun.GunItem; import com.atsuishio.superbwarfare.item.gun.data.GunData; -import com.atsuishio.superbwarfare.tools.Ammo; import io.netty.buffer.ByteBuf; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; @@ -51,20 +49,7 @@ public record ReloadMessage(int msgType) implements CustomPacketPayload { boolean clipLoad = data.ammo.get() == 0 && gunItem.isClipReload(stack); // 检查备弹 - boolean hasCreativeAmmoBox = player.getInventory().hasAnyMatching(item -> item.is(ModItems.CREATIVE_AMMO_BOX.get())); - - if (!hasCreativeAmmoBox) { - var ammoTypeInfo = data.ammoTypeInfo(); - - if (ammoTypeInfo.type() == GunData.AmmoConsumeType.PLAYER_AMMO) { - var ammoType = Ammo.getType(ammoTypeInfo.value()); - assert ammoType != null; - - if (ammoType.get(cap) == 0) return; - } else if ((ammoTypeInfo.type() == GunData.AmmoConsumeType.ITEM || ammoTypeInfo.type() == GunData.AmmoConsumeType.TAG) && !data.hasAmmo(player)) { - return; - } - } + if (!data.hasAmmo(player)) return; if (canReload || clipLoad) { int magazine = data.magazine();