diff --git a/src/main/java/net/mcreator/target/item/common/ammo/AmmoSupplierItem.java b/src/main/java/net/mcreator/target/item/common/ammo/AmmoSupplierItem.java index f6f19b20d..c31390f6c 100644 --- a/src/main/java/net/mcreator/target/item/common/ammo/AmmoSupplierItem.java +++ b/src/main/java/net/mcreator/target/item/common/ammo/AmmoSupplierItem.java @@ -30,12 +30,12 @@ public abstract class AmmoSupplierItem extends Item { stack.shrink(1); player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { - var newAmmoCount = player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> switch (this.type) { - case HANDGUN -> c.handgunAmmo; - case RIFLE -> c.rifleAmmo; - case SHOTGUN -> c.shotgunAmmo; - case SNIPER -> c.sniperAmmo; - }).orElse(0) + ammoToAdd; + var newAmmoCount = switch (this.type) { + case HANDGUN -> capability.handgunAmmo; + case RIFLE -> capability.rifleAmmo; + case SHOTGUN -> capability.shotgunAmmo; + case SNIPER -> capability.sniperAmmo; + } + ammoToAdd; switch (this.type) { case HANDGUN -> capability.handgunAmmo = newAmmoCount; case RIFLE -> capability.rifleAmmo = newAmmoCount; diff --git a/src/main/java/net/mcreator/target/tools/GunReload.java b/src/main/java/net/mcreator/target/tools/GunReload.java index f978bcd65..2cfaff43d 100644 --- a/src/main/java/net/mcreator/target/tools/GunReload.java +++ b/src/main/java/net/mcreator/target/tools/GunReload.java @@ -18,10 +18,10 @@ public class GunReload { int mag = tag.getInt("mag"); int ammo = tag.getInt("ammo"); int ammoToAdd = mag - ammo + (extraOne ? 1 : 0); - /** + /* * 空仓换弹的栓动武器应该在换单后取消待上膛标记 */ - if (ammo ==0 && tag.getDouble("bolt_action_time") > 0) { + if (ammo == 0 && tag.getDouble("bolt_action_time") > 0) { tag.putDouble("need_bolt_action", 0); }