From 3f74dd75350f6d46fd5d919456fc5c87bec290d1 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Thu, 30 Oct 2014 13:16:41 +0100 Subject: [PATCH] Make shuriken and ammoweapon/throwing knifes not throwable without ammo --- src/main/java/tconstruct/library/weaponry/AmmoWeapon.java | 3 ++- src/main/java/tconstruct/weaponry/weapons/Shuriken.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/library/weaponry/AmmoWeapon.java b/src/main/java/tconstruct/library/weaponry/AmmoWeapon.java index ce554568902..b540e760c5f 100644 --- a/src/main/java/tconstruct/library/weaponry/AmmoWeapon.java +++ b/src/main/java/tconstruct/library/weaponry/AmmoWeapon.java @@ -31,7 +31,8 @@ public int getMaxItemUseDuration(ItemStack par1ItemStack) { @Override public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) { - player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); + if(getAmmoCount(stack) > 0) + player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); return stack; } diff --git a/src/main/java/tconstruct/weaponry/weapons/Shuriken.java b/src/main/java/tconstruct/weaponry/weapons/Shuriken.java index c9193d45b28..6f36c6532c2 100644 --- a/src/main/java/tconstruct/weaponry/weapons/Shuriken.java +++ b/src/main/java/tconstruct/weaponry/weapons/Shuriken.java @@ -101,6 +101,9 @@ public float getWindupProgress(ItemStack itemStack, EntityPlayer player) { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if(getAmmoCount(stack) <= 0) + return stack; + launchProjectile(stack, world, player); // this is only used for the animation