From 7059206cb06f5e1d463b54d16cf62bb54cb860be Mon Sep 17 00:00:00 2001 From: Guillaume Mercier Date: Sat, 21 Dec 2024 11:35:14 -0500 Subject: [PATCH] prevent npe and log bad requests (#55) --- .../isolator/IsolatorComponentLogic.java | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java index ffef9f12..532b7f3c 100644 --- a/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/isolator/IsolatorComponentLogic.java @@ -4,6 +4,9 @@ import java.util.Random; import net.minecraft.item.ItemStack; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import binnie.core.genetics.Gene; import binnie.core.machines.Machine; import binnie.core.machines.inventory.IChargedSlots; @@ -20,6 +23,8 @@ import forestry.api.genetics.ISpeciesRoot; public class IsolatorComponentLogic extends ComponentProcessSetCost implements IProcess { + private static final Logger LOG = LogManager.getLogger("Genetics"); + protected float enzymePerProcess = 0.5f; protected float ethanolPerProcess = 10.0f; @@ -79,8 +84,21 @@ public class IsolatorComponentLogic extends ComponentProcessSetCost implements I final IChromosomeType[] karyo = root.getKaryotype(); final IChromosomeType chromosome = karyo[rand.nextInt(karyo.length)]; - final IAllele allele = rand.nextBoolean() ? individual.getGenome().getActiveAllele(chromosome) - : individual.getGenome().getInactiveAllele(chromosome); + final IAllele allele; + try { + allele = rand.nextBoolean() ? individual.getGenome().getActiveAllele(chromosome) + : individual.getGenome().getInactiveAllele(chromosome); + } catch (NullPointerException npe) { + // just return and eat the power without eating the rest of it + LOG.warn( + "NPE occurred on unknown gene: name: " + chromosome.getName() + + " | ordinal: " + + chromosome.ordinal() + + " | is null? " + + (individual.getGenome().getChromosomes()[chromosome.ordinal()] == null ? "true" + : "false")); + return; + } final Gene gene = new Gene(allele, chromosome, root); ItemStack serum = ItemSequence.create(gene);