From edc97ef25656cb08b5c01f99b2efa73465551ed5 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Fri, 21 Feb 2014 07:54:48 -0500 Subject: [PATCH] Scythe fixed The scythe should be working correctly now, or at least it works on vanilla plants. --- src/main/java/tconstruct/items/tools/Scythe.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/tconstruct/items/tools/Scythe.java b/src/main/java/tconstruct/items/tools/Scythe.java index 0e80d34f..026ebae5 100644 --- a/src/main/java/tconstruct/items/tools/Scythe.java +++ b/src/main/java/tconstruct/items/tools/Scythe.java @@ -38,7 +38,8 @@ public class Scythe extends Weapon return materials; } - static Material[] materials = new Material[] { Material.web, Material.cactus };// TODO find this//, Material.pumpkin, + static Material[] materials = new Material[] { Material.web, Material.cactus, Material.plants + , Material.leaves, Material.vine };// TODO find this//, Material.pumpkin, // Material.plants, Material.vine, // Material.leaves }; @@ -179,10 +180,7 @@ public class Scythe extends Weapon if (!cancelHarvest) { Block block = world.getBlock(xPos, yPos, zPos); - if (block != null)// && (block.getMaterial() == - // Material.leaves || - // block.isLeaves(world, xPos, - // yPos, zPos))) + if ((block != null)) { for (int iter = 0; iter < materials.length; iter++) {