correctly addressed underlying issue with extract phase, rolled back problematic fix

Author: thebluefish

src/render/extract.rs

@@ -377,27 +377,27 @@ pub fn extract(
 
 pub fn extract_removal(
     mut commands: Commands,
-    removed_tiles_query: Extract<Query<&RemovedTileEntity>>,
-    removed_maps_query: Extract<Query<&RemovedMapEntity>>,
+    removed_tiles_query: Extract<Query<(Entity, &RemovedTileEntity)>>,
+    removed_maps_query: Extract<Query<(Entity, &RemovedMapEntity)>>,
 ) {
     let mut removed_tiles: Vec<(Entity, ExtractedRemovedTileBundle)> = Vec::new();
-    for entity in removed_tiles_query.iter() {
+    for (entity, removed) in removed_tiles_query.iter() {
         removed_tiles.push((
-            entity.0,
+            entity,
             ExtractedRemovedTileBundle {
-                tile: ExtractedRemovedTile { entity: entity.0 },
+                tile: ExtractedRemovedTile { entity: removed.0 },
             },
         ));
     }
 
     commands.insert_or_spawn_batch(removed_tiles);
 
     let mut removed_maps: Vec<(Entity, ExtractedRemovedMapBundle)> = Vec::new();
-    for entity in removed_maps_query.iter() {
+    for (entity, removed) in removed_maps_query.iter() {
         removed_maps.push((
-            entity.0,
+            entity,
             ExtractedRemovedMapBundle {
-                map: ExtractedRemovedMap { entity: entity.0 },
+                map: ExtractedRemovedMap { entity: removed.0 },
             },
         ));
     }

src/render/mod.rs

@@ -309,20 +309,18 @@ pub struct RemovedMapEntity(pub Entity);
 
 fn removal_helper(
     mut commands: Commands,
-    entities: &Entities,
     mut removed_query: RemovedComponents<TilePos>,
 ) {
-    for entity in removed_query.read().filter(|entity| entities.contains(*entity)) {
+    for entity in removed_query.read() {
         commands.spawn(RemovedTileEntity(entity));
     }
 }
 
 fn removal_helper_tilemap(
     mut commands: Commands,
-    entities: &Entities,
     mut removed_query: RemovedComponents<TileStorage>,
 ) {
-    for entity in removed_query.read().filter(|entity| entities.contains(*entity)) {
+    for entity in removed_query.read() {
         commands.spawn(RemovedMapEntity(entity));
     }
 }