From 5e9cc9e2b1fb413e67e5cf1f392043cada7f612d Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 10 Oct 2014 00:24:32 -0700 Subject: [PATCH] Fix #280, crash on viewing the name of research notes from 1.6.4 --- src/main/java/forestry/core/genetics/ItemResearchNote.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/forestry/core/genetics/ItemResearchNote.java b/src/main/java/forestry/core/genetics/ItemResearchNote.java index d88009191..fd59c750b 100755 --- a/src/main/java/forestry/core/genetics/ItemResearchNote.java +++ b/src/main/java/forestry/core/genetics/ItemResearchNote.java @@ -235,7 +235,12 @@ public class ItemResearchNote extends ItemForestry { @Override public String getItemStackDisplayName(ItemStack itemstack) { ResearchNote note = new ResearchNote(itemstack.getTagCompound()); - return StringUtil.localizeAndFormatRaw(getUnlocalizedName(itemstack) + ".name", note.researcher.getName()); + String researcherName; + if (note.researcher == null) + researcherName = "Sengir"; + else + researcherName = note.researcher.getName(); + return StringUtil.localizeAndFormatRaw(getUnlocalizedName(itemstack) + ".name", researcherName); } @SuppressWarnings({"unchecked", "rawtypes"})