1 files changed, 39 insertions, 15 deletions

diff --git a/ecs/src/lib.rs b/ecs/src/lib.rs
index e9494a7..0c2197c 100644
--- a/ecs/src/lib.rs
+++ b/ecs/src/lib.rs
@@ -19,6 +19,7 @@ use crate::component::{
     Sequence as ComponentSequence,
 };
 use crate::entity::{Declaration as EntityDeclaration, Handle as EntityHandle};
+use crate::event::component::{Added, Removed};
 use crate::event::{Emitted as EmittedEvent, NewEvents, Submitter as EventSubmitter};
 use crate::extension::{Collector as ExtensionCollector, Extension};
 use crate::lock::Lock;
@@ -115,6 +116,7 @@ impl World
             entity_id,
             [component_parts],
             &mut self.data.component_storage,
+            &EventSubmitter::new(&self.data.new_events),
         );
     }
 
@@ -219,7 +221,7 @@ impl World
 
     pub fn event_submitter(&self) -> EventSubmitter<'_>
     {
-        EventSubmitter::new(self)
+        EventSubmitter::new(&self.data.new_events)
     }
 
     /// Performs a single tick.
@@ -331,6 +333,7 @@ impl World
             entity_uid,
             components,
             &mut self.data.component_storage,
+            &EventSubmitter::new(&self.data.new_events),
         );
     }
 
@@ -436,13 +439,32 @@ impl World
                         new_entity_uid,
                         components,
                         &mut self.data.component_storage,
+                        &EventSubmitter::new(&self.data.new_events),
                     );
                 }
                 Action::Despawn(entity_uid) => {
+                    let component_ids = self
+                        .get_entity(entity_uid)
+                        .expect("Not possible")
+                        .component_ids()
+                        .collect::<Vec<_>>();
+
                     if let Err(err) =
                         self.data.component_storage.remove_entity(entity_uid)
                     {
                         tracing::error!("Failed to despawn entity: {err}");
+                        continue;
+                    }
+
+                    let event_submitter = EventSubmitter::new(&self.data.new_events);
+
+                    for comp_id in component_ids {
+                        if comp_id.kind() == UidKind::Pair {
+                            continue;
+                        }
+
+                        event_submitter
+                            .submit_event(&Pair::new::<Removed>(comp_id), entity_uid);
                     }
                 }
                 Action::AddComponents(entity_uid, components) => {
@@ -450,6 +472,7 @@ impl World
                         entity_uid,
                         components,
                         &mut self.data.component_storage,
+                        &EventSubmitter::new(&self.data.new_events),
                     );
                 }
                 Action::RemoveComponents(entity_uid, component_ids) => {
@@ -457,6 +480,7 @@ impl World
                         entity_uid,
                         component_ids,
                         &mut self.data.component_storage,
+                        &EventSubmitter::new(&self.data.new_events),
                     );
                 }
                 Action::Stop => {
@@ -470,13 +494,11 @@ impl World
         entity_uid: Uid,
         components: impl IntoIterator<Item = ComponentParts>,
         component_storage: &mut ComponentStorage,
-    ) -> Vec<Uid>
+        event_submitter: &EventSubmitter<'_>,
+    )
     {
         let component_iter = components.into_iter();
 
-        let mut added_component_ids =
-            Vec::<Uid>::with_capacity(component_iter.size_hint().0);
-
         for component_parts in component_iter {
             let comp_id = component_parts.id();
 
@@ -488,23 +510,23 @@ impl World
                 continue;
             }
 
-            added_component_ids.push(comp_id);
-        }
+            if comp_id.kind() == UidKind::Pair {
+                continue;
+            }
 
-        added_component_ids
+            event_submitter.submit_event(&Pair::new::<Added>(comp_id), entity_uid);
+        }
     }
 
     fn remove_entity_components(
         entity_uid: Uid,
         component_ids: impl IntoIterator<Item = Uid>,
         component_storage: &mut ComponentStorage,
-    ) -> Vec<Uid>
+        event_submitter: &EventSubmitter<'_>,
+    )
     {
         let component_id_iter = component_ids.into_iter();
 
-        let mut removed_component_ids =
-            Vec::<Uid>::with_capacity(component_id_iter.size_hint().0);
-
         for component_id in component_id_iter {
             if let Err(err) =
                 component_storage.remove_entity_component(entity_uid, component_id)
@@ -513,10 +535,12 @@ impl World
                 continue;
             }
 
-            removed_component_ids.push(component_id);
-        }
+            if component_id.kind() == UidKind::Pair {
+                continue;
+            }
 
-        removed_component_ids
+            event_submitter.submit_event(&Pair::new::<Removed>(component_id), entity_uid);
+        }
     }
 
     fn emit_event_observers(&self, event_id: Uid, emitted_event: &EmittedEvent<'_>)