From 52e137a5507a3e25fadc35fb13bc687a9d628cff Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Fri, 27 Nov 2020 23:34:25 +0800 Subject: [PATCH] Fix a worldgen deadlock --- .../io/izzel/arclight/common/mixin/core/entity/EntityMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/EntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/EntityMixin.java index d79d3e25..d99275a2 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/EntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/EntityMixin.java @@ -482,7 +482,7 @@ public abstract class EntityMixin implements InternalEntityBridge, EntityBridge, @Inject(method = "setPositionAndRotation", at = @At("RETURN")) private void arclight$loadChunk(double x, double y, double z, float yaw, float pitch, CallbackInfo ci) { - this.world.getChunk((int) Math.floor(this.getPosX()) >> 4, (int) Math.floor(this.getPosZ()) >> 4); + if (this.valid) this.world.getChunk((int) Math.floor(this.getPosX()) >> 4, (int) Math.floor(this.getPosZ()) >> 4); } public boolean canCollideWith(Entity entity) {