From bff454f3974c9114be8d56a24bb71b57269c270a Mon Sep 17 00:00:00 2001 From: t00thpick1 Date: Tue, 24 Jul 2018 20:50:17 -0400 Subject: [PATCH] Wood is not planks. --- .../gmail/nossr50/datatypes/skills/MaterialType.java | 2 +- src/main/java/com/gmail/nossr50/util/ItemUtils.java | 12 ++++++++++++ .../com/gmail/nossr50/util/skills/SkillUtils.java | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java b/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java index 8458c43fb..62f7ed160 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java +++ b/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java @@ -21,7 +21,7 @@ public enum MaterialType { return Material.LEATHER; case WOOD: - return Material.OAK_WOOD; + return Material.OAK_PLANKS; case STONE: return Material.COBBLESTONE; diff --git a/src/main/java/com/gmail/nossr50/util/ItemUtils.java b/src/main/java/com/gmail/nossr50/util/ItemUtils.java index 08aac96cc..a20f0a5da 100644 --- a/src/main/java/com/gmail/nossr50/util/ItemUtils.java +++ b/src/main/java/com/gmail/nossr50/util/ItemUtils.java @@ -681,6 +681,18 @@ public final class ItemUtils { case JUNGLE_LOG: case OAK_LOG: case SPRUCE_LOG: + case OAK_WOOD: + case ACACIA_WOOD: + case BIRCH_WOOD: + case DARK_OAK_WOOD: + case STRIPPED_ACACIA_WOOD: + case JUNGLE_WOOD: + case SPRUCE_WOOD: + case STRIPPED_BIRCH_WOOD: + case STRIPPED_DARK_OAK_WOOD: + case STRIPPED_JUNGLE_WOOD: + case STRIPPED_OAK_WOOD: + case STRIPPED_SPRUCE_WOOD: case STRIPPED_ACACIA_LOG: case STRIPPED_BIRCH_LOG: case STRIPPED_DARK_OAK_LOG: diff --git a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java b/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java index 3e0183c36..be785453d 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java @@ -255,7 +255,7 @@ public class SkillUtils { return Material.COBBLESTONE; } else if (ItemUtils.isWoodTool(inHand)) { - return Material.OAK_WOOD; + return Material.OAK_PLANKS; } else if (ItemUtils.isLeatherArmor(inHand)) { return Material.LEATHER;