Bugfix: apply_despawn_set silently fails if the entity doesn't exist

benfrankel · Dec 7, 2023 · 0d200cb · 0d200cb
1 parent a8a0c82
commit 0d200cb
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/util/despawn.rs b/src/util/despawn.rs
@@ -69,6 +69,9 @@ impl DespawnSet {
 
 fn apply_despawn_set(mut commands: Commands, mut despawn: ResMut<DespawnSet>) {
     for entity in despawn.0.drain() {
-        commands.entity(entity).despawn_recursive();
+        if let Some(entity) = commands.get_entity(entity) {
+            entity.despawn_recursive();
+        }
+        // Silently fail if the entity does not exist anymore.
     }
 }