fix(item): item destroy not sending correctly

src/nodes/alias.rs

@@ -81,6 +81,18 @@ pub fn get_original(node: Arc<Node>, stop_on_disabled: bool) -> Option<Arc<Node>
 	}
 	get_original(alias.original.upgrade()?, stop_on_disabled)
 }
+pub fn links_to(alias: Arc<Node>, original: Weak<Node>) -> bool {
+	let Ok(alias) = alias.get_aspect::<Alias>() else {
+		return false;
+	};
+	if alias.original.ptr_eq(&original) {
+		return true;
+	}
+	let Some(original_strong) = alias.original.upgrade() else {
+		return false;
+	};
+	links_to(original_strong, original)
+}
 
 #[derive(Debug, Default, Clone)]
 pub struct AliasList(Registry<Node>);
@@ -88,7 +100,13 @@ impl AliasList {
 	fn add(&self, node: &Arc<Node>) {
 		self.0.add_raw(node);
 	}
-	pub fn get<A: Aspect>(&self, aspect: &A) -> Option<Arc<Node>> {
+	pub fn get_from_original_node(&self, original: Weak<Node>) -> Option<Arc<Node>> {
+		self.0
+			.get_valid_contents()
+			.into_iter()
+			.find(move |node| links_to(node.clone(), original.clone()))
+	}
+	pub fn get_from_aspect<A: Aspect>(&self, aspect: &A) -> Option<Arc<Node>> {
 		self.0.get_valid_contents().into_iter().find(|node| {
 			let Some(node) = get_original(node.clone(), false) else {
 				return false;

src/nodes/input/method.rs

@@ -124,7 +124,7 @@ impl InputMethod {
 		let Some(tx_node) = self.spatial.node() else {
 			return;
 		};
-		let Some(handler_alias) = self.handler_aliases.get(handler) else {
+		let Some(handler_alias) = self.handler_aliases.get_from_aspect(handler) else {
 			return;
 		};
 		let _ = input_method_client::destroy_handler(&tx_node, handler_alias.id);

src/nodes/input/mod.rs

@@ -161,13 +161,15 @@ pub fn process_input() {
 			// Iterate over the distance links and send input to them
 			for (i, input_link) in input_links.into_iter().enumerate() {
 				let handler = input_link.handler.spatial.node().unwrap();
-				handler_input.entry(handler.id).or_insert_with(|| (handler.clone(), Vec::new(), Vec::new()));
+				handler_input
+					.entry(handler.id)
+					.or_insert_with(|| (handler.clone(), Vec::new(), Vec::new()));
 				let (_, methods, datas) = handler_input.get_mut(&handler.id).unwrap();
 
 				let method_alias = input_link
 					.handler
 					.method_aliases
-					.get(input_link.method.as_ref())
+					.get_from_aspect(input_link.method.as_ref())
 					.unwrap();
 				method_alias.set_enabled(true);
 				datas.push(input_link.serialize(

src/nodes/items/mod.rs

@@ -62,7 +62,7 @@ impl PartialEq for TypeInfo {
 impl Eq for TypeInfo {}
 
 pub struct Item {
-	node: Weak<Node>,
+	spatial: Arc<Spatial>,
 	type_info: &'static TypeInfo,
 	captured_acceptor: Mutex<Weak<ItemAcceptor>>,
 	pub specialization: ItemType,
@@ -74,7 +74,7 @@ impl Item {
 		specialization: ItemType,
 	) -> Arc<Self> {
 		let item = Item {
-			node: Arc::downgrade(node),
+			spatial: node.aspects.get::<Spatial>().unwrap(),
 			type_info,
 			captured_acceptor: Default::default(),
 			specialization,
@@ -101,7 +101,7 @@ impl Item {
 	}
 	fn make_alias(&self, client: &Arc<Client>, alias_list: &AliasList) -> Result<Arc<Node>> {
 		Alias::create(
-			&self.node.upgrade().unwrap(),
+			&self.spatial.node().unwrap(),
 			client,
 			self.type_info.alias_info.clone() + ITEM_ASPECT_ALIAS_INFO.clone(),
 			Some(alias_list),
@@ -205,10 +205,10 @@ impl ItemUI {
 		item.specialization.send_ui_item_created(&node, &item_alias);
 	}
 	fn handle_capture_item(&self, item: &Item, acceptor: &ItemAcceptor) {
-		let Some(item_alias) = self.item_aliases.get(item) else {
+		let Some(item_alias) = self.item_aliases.get_from_aspect(item) else {
 			return;
 		};
-		let Some(acceptor_alias) = self.acceptor_aliases.get(acceptor) else {
+		let Some(acceptor_alias) = self.acceptor_aliases.get_from_aspect(acceptor) else {
 			return;
 		};
 		let _ = item_ui_client::capture_item(
@@ -218,10 +218,10 @@ impl ItemUI {
 		);
 	}
 	fn handle_release_item(&self, item: &Item, acceptor: &ItemAcceptor) {
-		let Some(item_alias) = self.item_aliases.get(item) else {
+		let Some(item_alias) = self.item_aliases.get_from_aspect(item) else {
 			return;
 		};
-		let Some(acceptor_alias) = self.acceptor_aliases.get(acceptor) else {
+		let Some(acceptor_alias) = self.acceptor_aliases.get_from_aspect(acceptor) else {
 			return;
 		};
 		let _ = item_ui_client::release_item(
@@ -231,7 +231,10 @@ impl ItemUI {
 		);
 	}
 	fn handle_destroy_item(&self, item: &Item) {
-		let Some(item_alias) = self.item_aliases.get(item) else {
+		let Some(item_alias) = self
+			.item_aliases
+			.get_from_original_node(item.spatial.node.clone())
+		else {
 			return;
 		};
 		let _ = item_ui_client::destroy_item(&self.node.upgrade().unwrap(), item_alias.id);
@@ -272,7 +275,7 @@ impl ItemUI {
 		(acceptor.type_info.new_acceptor_fn)(&node, &acceptor_alias, &acceptor_field_alias);
 	}
 	fn handle_destroy_acceptor(&self, acceptor: &ItemAcceptor) {
-		let acceptor_alias = self.acceptor_aliases.get(acceptor).unwrap();
+		let acceptor_alias = self.acceptor_aliases.get_from_aspect(acceptor).unwrap();
 		let _ = item_ui_client::destroy_acceptor(&self.node.upgrade().unwrap(), acceptor_alias.id);
 
 		self.acceptor_aliases
@@ -335,7 +338,7 @@ impl ItemAcceptor {
 		let Some(node) = self.spatial.node() else {
 			return;
 		};
-		let alias = self.accepted_aliases.get(item).unwrap();
+		let alias = self.accepted_aliases.get_from_aspect(item).unwrap();
 		let _ = item_acceptor_client::release_item(&node, alias.id);
 	}
 }

src/nodes/spatial/mod.rs

@@ -40,7 +40,7 @@ impl Transform {
 static ZONEABLE_REGISTRY: Registry<Spatial> = Registry::new();
 
 pub struct Spatial {
-	node: Weak<Node>,
+	pub node: Weak<Node>,
 	parent: Mutex<Option<Arc<Spatial>>>,
 	old_parent: Mutex<Option<Arc<Spatial>>>,
 	transform: Mutex<Mat4>,