aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/misc
diff options
context:
space:
mode:
authorchochem <40274384+chochem@users.noreply.github.com>2024-11-24 13:55:27 +0000
committerGitHub <noreply@github.com>2024-11-24 13:55:27 +0000
commitd7bb3a4413c3bc95cbd68581b71aadb1a11286fd (patch)
tree910dfbf82a9ddfd88251bbe6aea71e462e2a0b68 /src/main/java/gregtech/loaders/misc
parent3ca980252c3e14ef0c925cc02ed74d3e999583b4 (diff)
downloadGT5-Unofficial-d7bb3a4413c3bc95cbd68581b71aadb1a11286fd.tar.gz
GT5-Unofficial-d7bb3a4413c3bc95cbd68581b71aadb1a11286fd.tar.bz2
GT5-Unofficial-d7bb3a4413c3bc95cbd68581b71aadb1a11286fd.zip
fix treetwister effect crash (#3549)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gregtech/loaders/misc')
-rw-r--r--src/main/java/gregtech/loaders/misc/bees/GTAlleleEffect.java12
1 files 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;
}