From ee472f01666f8fab92a7288932480587b7c7c3c1 Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Mon, 7 Mar 2022 15:42:05 +0800 Subject: [PATCH] Fix schematic cannon crash (#509) --- .../activationrange/EntityMixin_ActivationRange.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java index 562df32b..862f0032 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java @@ -1,8 +1,8 @@ package io.izzel.arclight.common.mixin.optimization.general.activationrange; import io.izzel.arclight.common.bridge.core.world.WorldBridge; -import io.izzel.arclight.common.mod.ArclightConstants; import io.izzel.arclight.common.bridge.optimization.EntityBridge_ActivationRange; +import io.izzel.arclight.common.mod.ArclightConstants; import io.izzel.arclight.common.mod.util.DistValidate; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; @@ -34,7 +34,12 @@ public abstract class EntityMixin_ActivationRange implements EntityBridge_Activa private void arclight$init(EntityType entityTypeIn, Level worldIn, CallbackInfo ci) { activationType = ActivationRange.initializeEntityActivationType((Entity) (Object) this); if (DistValidate.isValid(worldIn)) { - this.defaultActivationState = ActivationRange.initializeEntityActivationState((Entity) (Object) this, ((WorldBridge) worldIn).bridge$spigotConfig()); + var config = ((WorldBridge) worldIn).bridge$spigotConfig(); + if (config != null) { + this.defaultActivationState = ActivationRange.initializeEntityActivationState((Entity) (Object) this, config); + } else { + this.defaultActivationState = false; + } } else { this.defaultActivationState = false; }