From d7bb3a4413c3bc95cbd68581b71aadb1a11286fd Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Sun, 24 Nov 2024 13:55:27 +0000 Subject: fix treetwister effect crash (#3549) Co-authored-by: Martin Robertz --- src/main/java/gregtech/loaders/misc/bees/GTAlleleEffect.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/gregtech/loaders/misc/bees/GTAlleleEffect.java b/src/main/java/gregtech/loaders/misc/bees/GTAlleleEffect.java index 128e3dfeb1..e2403178d1 100644 --- a/src/main/java/gregtech/loaders/misc/bees/GTAlleleEffect.java +++ b/src/main/java/gregtech/loaders/misc/bees/GTAlleleEffect.java @@ -38,11 +38,15 @@ public abstract class GTAlleleEffect extends Allele implements IAlleleBeeEffect @Override public IEffectData doEffect(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) { - int ticksPassed = storedData.getInteger(0); - if (ticksPassed >= this.tickThrottle) { - storedData = this.doEffectTickThrottled(genome, storedData, housing); + if (storedData != null) { + int ticksPassed = storedData.getInteger(0); + if (ticksPassed >= this.tickThrottle) { + storedData = this.doEffectTickThrottled(genome, storedData, housing); + } else { + storedData.setInteger(0, ticksPassed + 1); + } } else { - storedData.setInteger(0, ticksPassed + 1); + storedData = this.doEffectTickThrottled(genome, storedData, housing); } return storedData; } -- cgit