From 6d9dc59f0febe3bcd1f2082d1e7cdfd5a92a99c3 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sun, 16 Nov 2014 21:21:39 +0100 Subject: [PATCH] Fix damage for arrows/bolts not being displayed in stations --- src/main/java/tconstruct/modifiers/tools/ModLapis.java | 2 +- src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java | 2 +- src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/tconstruct/modifiers/tools/ModLapis.java b/src/main/java/tconstruct/modifiers/tools/ModLapis.java index 941bc894..8758769c 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModLapis.java +++ b/src/main/java/tconstruct/modifiers/tools/ModLapis.java @@ -218,6 +218,6 @@ public class ModLapis extends ItemModTypeFilter 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 index b2652a12..69030878 100644 --- a/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java +++ b/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java @@ -92,7 +92,7 @@ public class ArrowAmmo extends AmmoItem { @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 index 0e640f0a..3df4432f 100644 --- a/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java +++ b/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java @@ -76,7 +76,7 @@ public class BoltAmmo extends AmmoItem { @Override public String[] getTraits () { - return new String[] { "ammo", "projectile" }; + return new String[] { "ammo", "projectile", "weapon" }; } @Override