From 8ef193c8a5902dc8984f5d77df5b7b7136250b87 Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 20 Jun 2015 20:38:01 -0700 Subject: [PATCH] Fix #730 Crash with corrupted forestry leaves from MFR harvester --- .../java/forestry/arboriculture/gadgets/TileLeaves.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java b/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java index a7acb60bf..9c72084d6 100755 --- a/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java +++ b/src/main/java/forestry/arboriculture/gadgets/TileLeaves.java @@ -328,7 +328,11 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru } public String getUnlocalizedName() { - return getTree().getGenome().getPrimary().getUnlocalizedName(); + ITree tree = getTree(); + if (tree == null) { + return "for.leaves.corrupted"; + } + return tree.getGenome().getPrimary().getUnlocalizedName(); } /* NETWORK */