Make shuriken and ammoweapon/throwing knifes not throwable without ammo

SlimeKnights · Oct 30, 2014 · 3f74dd7 · 3f74dd7
1 parent 9d7d33f
commit 3f74dd7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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