2023-04-23 16:13:23 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
|
|
Date: Sun, 23 Apr 2023 07:08:26 -0700
|
|
|
|
Subject: [PATCH] Block reading in-world tile entities on worldgen threads
|
|
|
|
|
|
|
|
The returned TE may be in the world, in which case it is unsafe
|
|
|
|
for the current thread to modify or access its contents.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java b/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java
|
2024-07-31 05:09:52 +02:00
|
|
|
index d7d332d8ba3442887e80d2c3d7bddb9de2674c2d..f135ed136aa01bf18b4bd107109db8f8ebf440d2 100644
|
2023-04-23 16:13:23 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java
|
2024-07-31 05:09:52 +02:00
|
|
|
@@ -92,6 +92,11 @@ public class ImposterProtoChunk extends ProtoChunk implements ca.spottedleaf.moo
|
2023-04-23 16:13:23 +02:00
|
|
|
@Nullable
|
|
|
|
@Override
|
|
|
|
public BlockEntity getBlockEntity(BlockPos pos) {
|
|
|
|
+ // Folia start - block reading possibly in-world block data for worldgen threads
|
2024-07-31 05:09:52 +02:00
|
|
|
+ if (!this.allowWrites && !ca.spottedleaf.moonrise.common.util.TickThread.isTickThread()) {
|
2023-04-23 16:13:23 +02:00
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+ // Folia end - block reading possibly in-world block data for worldgen threads
|
|
|
|
return this.wrapped.getBlockEntity(pos);
|
|
|
|
}
|
|
|
|
|