From c17c742d67277a9fa80559bd3dd1d81ba95afdc6 Mon Sep 17 00:00:00 2001 From: Danila Date: Sun, 8 Jun 2025 17:59:29 +0300 Subject: [PATCH] add error on get --- crates/bevy_ecs/src/system/related_system.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/crates/bevy_ecs/src/system/related_system.rs b/crates/bevy_ecs/src/system/related_system.rs index a069c59a9b..28ccb6885b 100644 --- a/crates/bevy_ecs/src/system/related_system.rs +++ b/crates/bevy_ecs/src/system/related_system.rs @@ -8,9 +8,15 @@ use bevy_ecs::{ system::{Query, SystemMeta, SystemParam}, world::{unsafe_world_cell::UnsafeWorldCell, World}, }; +use derive_more::derive::Display; use crate::error::BevyError; +#[derive(Debug, Display, Copy, Clone)] +pub struct RelatedQueryError; + +impl std::error::Error for RelatedQueryError {} + // SystemParam for combine 2 related queries pub struct Related<'w, 's, D: QueryData, F1: QueryFilter, R: RelationshipTarget, F2: QueryFilter> { data_query: Query<'w, 's, D, (F1, With)>, @@ -65,7 +71,7 @@ impl<'w, 's, D: QueryData, F1: QueryFilter, R: RelationshipTarget, F2: QueryFilt { return Ok(self.data_query.get(entity)?); } else { - panic!("as"); + Err(RelatedQueryError.into()) } } }