From d6af85ad771ac9fc6e40cd9aaafe5bec6e0132fc Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 13 Jun 2016 21:39:28 -0700 Subject: [PATCH] Fix #1314 Crash with WAILA when looking at broken leaves --- .../blocks/BlockForestryLeaves.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java index 8a3b12b98..9126579fd 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java @@ -214,17 +214,16 @@ public class BlockForestryLeaves extends BlockLeaves implements ITileEntityProvi @Override public List onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { + String speciesUid = TreeDefinition.Oak.getUID(); + TileLeaves leaves = TileUtil.getTile(world, pos, TileLeaves.class); - if (leaves == null) { - return null; + if (leaves != null) { + ITree tree = leaves.getTree(); + if (tree != null) { + speciesUid = tree.getGenome().getPrimary().getUID(); + } } - - ITree tree = leaves.getTree(); - if (tree == null) { - return null; - } - - String speciesUid = tree.getGenome().getPrimary().getUID(); + return Collections.singletonList(PluginArboriculture.blocks.getDecorativeLeaves(speciesUid)); }