Fix damage for arrows/bolts not being displayed in stations

SlimeKnights · Nov 16, 2014 · 6d9dc59 · 6d9dc59
1 parent 4c26f85
commit 6d9dc59
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/tconstruct/modifiers/tools/ModLapis.java b/src/main/java/tconstruct/modifiers/tools/ModLapis.java
@@ -218,6 +218,6 @@ void updateModTag (ItemStack tool, int[] keys)
     public boolean validType (ToolCore tool)
     {
         List list = Arrays.asList(tool.getTraits());
-        return list.contains("weapon") || list.contains("harvest");
+        return !list.contains("ammo") && (list.contains("weapon") || list.contains("harvest"));
     }
 }
diff --git a/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java b/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java
@@ -92,7 +92,7 @@ public int durabilityTypeHandle() {
     @Override
     public String[] getTraits ()
     {
-        return new String[] { "ammo", "projectile" };
+        return new String[] { "ammo", "projectile", "weapon" };
     }
 
     @Override

diff --git a/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java b/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java
@@ -76,7 +76,7 @@ public Item getAccessoryItem() {
     @Override
     public String[] getTraits ()
     {
-        return new String[] { "ammo", "projectile" };
+        return new String[] { "ammo", "projectile", "weapon" };
     }
 
     @Override