diff --git a/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java b/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java index 9e76f72c..b416967a 100644 --- a/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java +++ b/src/main/java/tconstruct/library/weaponry/ProjectileWeapon.java @@ -200,10 +200,14 @@ public abstract class ProjectileWeapon extends ToolCore implements IBattlegearWe // use up ammo if (!player.capabilities.isCreativeMode && !world.isRemote) { if (ammo.getItem() instanceof IAmmo) { + // if we're dealing with tinkers ammo, handle their custom logic if (ammo.hasTagCompound()) { int ammoReinforced = ammo.getTagCompound().getCompoundTag("InfiTool").getInteger("Unbreaking"); if (random.nextInt(10) < 10 - ammoReinforced) ((IAmmo) ammo.getItem()).consumeAmmo(1, ammo); } else player.inventory.consumeInventoryItem(ammo.getItem()); + } else { + // for non-custom IAmmo types (like vanilla arrows), simply consume them like in vanilla + player.inventory.consumeInventoryItem(ammo.getItem()); } }