diff --git a/src/main/java/net/minecraftforge/common/ForgeInternalHandler.java b/src/main/java/net/minecraftforge/common/ForgeInternalHandler.java index 964d077460..340e63a4b8 100644 --- a/src/main/java/net/minecraftforge/common/ForgeInternalHandler.java +++ b/src/main/java/net/minecraftforge/common/ForgeInternalHandler.java @@ -24,6 +24,8 @@ import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.concurrent.ThreadTaskExecutor; +import net.minecraft.util.concurrent.TickDelayedTask; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.common.loot.LootModifierManager; import net.minecraftforge.common.util.FakePlayerFactory; @@ -40,6 +42,8 @@ import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.TickEvent.ClientTickEvent; import net.minecraftforge.event.TickEvent.Phase; import net.minecraftforge.event.TickEvent.ServerTickEvent; +import net.minecraftforge.fml.LogicalSide; +import net.minecraftforge.fml.LogicalSidedProvider; import net.minecraftforge.server.command.ForgeCommand; import net.minecraftforge.server.command.ConfigCommand; @@ -60,7 +64,8 @@ public class ForgeInternalHandler { entity.remove(); event.setCanceled(true); - event.getWorld().addFreshEntity(newEntity); + ThreadTaskExecutor executor = LogicalSidedProvider.WORKQUEUE.get(event.getWorld().isClientSide ? LogicalSide.CLIENT : LogicalSide.SERVER); + executor.tell(new TickDelayedTask(0, () -> event.getWorld().addFreshEntity(newEntity))); } } } diff --git a/src/main/java/net/minecraftforge/event/entity/EntityJoinWorldEvent.java b/src/main/java/net/minecraftforge/event/entity/EntityJoinWorldEvent.java index 9636aa8795..f46237072e 100644 --- a/src/main/java/net/minecraftforge/event/entity/EntityJoinWorldEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/EntityJoinWorldEvent.java @@ -30,6 +30,7 @@ import java.util.Collection; * EntityJoinWorldEvent is fired when an Entity joins the world.
* This event is fired whenever an Entity is added to the world in * {@link World#loadEntities(Collection)}, {@link net.minecraft.world.ServerWorld#loadEntities(Collection)} {@link World#joinEntityInSurroundings(Entity)}, and {@link World#spawnEntity(Entity)}.
+ * Note: This event may be called before the underlying {@link net.minecraft.world.chunk.Chunk} is promoted to {@link net.minecraft.world.chunk.ChunkStatus#FULL}. You will cause chunk loading deadlocks if you don't delay your world interactions.
*
* {@link #world} contains the world in which the entity is to join.
*
diff --git a/src/main/java/net/minecraftforge/event/world/ChunkEvent.java b/src/main/java/net/minecraftforge/event/world/ChunkEvent.java index 4f4ce0219b..aa15d11e8d 100644 --- a/src/main/java/net/minecraftforge/event/world/ChunkEvent.java +++ b/src/main/java/net/minecraftforge/event/world/ChunkEvent.java @@ -58,6 +58,7 @@ public class ChunkEvent extends WorldEvent * This event is fired during chunk loading in
* {@link ChunkProviderClient#loadChunk(int, int)},
* Chunk.onChunkLoad().
+ * Note: This event may be called before the underlying {@link net.minecraft.world.chunk.Chunk} is promoted to {@link net.minecraft.world.chunk.ChunkStatus#FULL}. You will cause chunk loading deadlocks if you don't delay your world interactions.
*
* This event is not {@link net.minecraftforge.eventbus.api.Cancelable}.
*