From be81877137df57de26030bceecbef68b9f05b3e5 Mon Sep 17 00:00:00 2001
From: mat <git@matdoes.dev>
Date: Wed, 4 Jun 2025 21:53:06 -0600
Subject: fix panic when receiving add_entity and start_configuration in the
 same update

---
 azalea-entity/src/plugin/mod.rs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'azalea-entity/src/plugin')

diff --git a/azalea-entity/src/plugin/mod.rs b/azalea-entity/src/plugin/mod.rs
index 03afe7cd..6a6c9615 100644
--- a/azalea-entity/src/plugin/mod.rs
+++ b/azalea-entity/src/plugin/mod.rs
@@ -46,6 +46,11 @@ impl Plugin for EntityPlugin {
             Update,
             (
                 (
+                    // remove_despawned_entities_from_indexes is done again here to correctly
+                    // handle the case where an entity is spawned and then the world is removed at
+                    // the same time (like with ClientboundStartConfiguration).
+                    indexing::remove_despawned_entities_from_indexes
+                        .in_set(EntityUpdateSet::Deindex),
                     indexing::update_entity_chunk_positions,
                     indexing::insert_entity_chunk_position,
                 )
-- 
cgit v1.2.3