From 3c9572eb832352ff7025e7bf67ab569853e30f86 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 6 Jan 2018 16:21:47 +0100 Subject: [PATCH] Fix #1874 Crash when adding bee to BQM quest / chestloot --- .../java/forestry/apiculture/items/ItemBeeGE.java | 14 ++++++++++---- src/main/java/forestry/core/genetics/Genome.java | 1 - 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/forestry/apiculture/items/ItemBeeGE.java b/src/main/java/forestry/apiculture/items/ItemBeeGE.java index ac316f818..c477e74c0 100755 --- a/src/main/java/forestry/apiculture/items/ItemBeeGE.java +++ b/src/main/java/forestry/apiculture/items/ItemBeeGE.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.apiculture.items; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; @@ -35,6 +36,7 @@ import forestry.api.core.Tabs; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleSpecies; +import forestry.apiculture.genetics.BeeDefinition; import forestry.apiculture.genetics.BeeGenome; import forestry.apiculture.genetics.DefaultBeeModelProvider; import forestry.core.config.Config; @@ -54,10 +56,14 @@ public class ItemBeeGE extends ItemGE implements IColoredItem { } } + @Nonnull @Override - @Nullable public IBee getIndividual(ItemStack itemstack) { - return BeeManager.beeRoot.getMember(itemstack); + IBee individual = BeeManager.beeRoot.getMember(itemstack); + if(individual == null){ + individual = BeeDefinition.FOREST.getIndividual(); + } + return individual; } @Override @@ -71,7 +77,7 @@ public class ItemBeeGE extends ItemGE implements IColoredItem { return super.getItemStackDisplayName(itemstack); } - IBee individual = BeeManager.beeRoot.getMember(itemstack); + IBee individual = getIndividual(itemstack); String customBeeKey = "for.bees.custom." + type.getName() + "." + individual.getGenome().getPrimary().getUnlocalizedName().replace("bees.species.", ""); if (Translator.canTranslateToLocal(customBeeKey)) { return Translator.translateToLocal(customBeeKey); @@ -90,7 +96,7 @@ public class ItemBeeGE extends ItemGE implements IColoredItem { } if (type != EnumBeeType.DRONE) { - IBee individual = BeeManager.beeRoot.getMember(itemstack); + IBee individual = getIndividual(itemstack); if (individual.isNatural()) { list.add(TextFormatting.YELLOW + TextFormatting.ITALIC.toString() + Translator.translateToLocal("for.bees.stock.pristine")); } else { diff --git a/src/main/java/forestry/core/genetics/Genome.java b/src/main/java/forestry/core/genetics/Genome.java index 183a2a113..6d67ac38a 100755 --- a/src/main/java/forestry/core/genetics/Genome.java +++ b/src/main/java/forestry/core/genetics/Genome.java @@ -258,7 +258,6 @@ public abstract class Genome implements IGenome { } @Override - public IAllele getActiveAllele(IChromosomeType chromosomeType) { return chromosomes[chromosomeType.ordinal()].getActiveAllele(); }