From 7cda899bef23e0dc26ce57fb984d71dc8af19e6e Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 1 Aug 2015 00:58:37 -0700 Subject: [PATCH] Fix #775 Found Chromosome with invalid Alleles --- src/main/java/forestry/apiculture/genetics/BeeGenome.java | 4 ++++ src/main/java/forestry/arboriculture/genetics/TreeGenome.java | 4 ++++ .../forestry/lepidopterology/genetics/ButterflyGenome.java | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/src/main/java/forestry/apiculture/genetics/BeeGenome.java b/src/main/java/forestry/apiculture/genetics/BeeGenome.java index 2a55cc356..7f754bb68 100755 --- a/src/main/java/forestry/apiculture/genetics/BeeGenome.java +++ b/src/main/java/forestry/apiculture/genetics/BeeGenome.java @@ -73,6 +73,10 @@ public class BeeGenome extends Genome implements IBeeGenome { // NBT RETRIEVAL public static IAlleleBeeSpecies getSpecies(ItemStack itemStack) { + if (!BeeManager.beeRoot.isMember(itemStack)) { + return null; + } + IAlleleSpecies species = getSpeciesDirectly(itemStack); if (species instanceof IAlleleBeeSpecies) { return (IAlleleBeeSpecies) species; diff --git a/src/main/java/forestry/arboriculture/genetics/TreeGenome.java b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java index df0c915ec..6743839c5 100755 --- a/src/main/java/forestry/arboriculture/genetics/TreeGenome.java +++ b/src/main/java/forestry/arboriculture/genetics/TreeGenome.java @@ -46,6 +46,10 @@ public class TreeGenome extends Genome implements ITreeGenome { // NBT RETRIEVAL public static IAlleleTreeSpecies getSpecies(ItemStack itemStack) { + if (!TreeManager.treeRoot.isMember(itemStack)) { + return null; + } + IAlleleSpecies species = getSpeciesDirectly(itemStack); if (species instanceof IAlleleTreeSpecies) { return (IAlleleTreeSpecies) species; diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java index 5a7981543..ae131a19b 100755 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyGenome.java @@ -43,6 +43,10 @@ public class ButterflyGenome extends Genome implements IButterflyGenome { // NBT RETRIEVAL public static IAlleleButterflySpecies getSpecies(ItemStack itemStack) { + if (!PluginLepidopterology.butterflyInterface.isMember(itemStack)) { + return null; + } + IAlleleSpecies species = getSpeciesDirectly(itemStack); if (species instanceof IAlleleButterflySpecies) { return (IAlleleButterflySpecies) species;