forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wrong method call in relationship replacement command (#18824)

Browse Source 
Fixes a small mix-up from #18058, which added bulk relationship
replacement methods.

`EntityCommands::replace_related_with_difference` calls
`EntityWorldMut::replace_children_with_difference` instead of
`EntityWorldMut::replace_related_with_difference`, which means it always
operates on the `ChildOf` relationship instead of the `R: Relationship`
generic it's provided.

`EntityCommands::replace_children_with_difference` takes an `R:
Relationship` generic that it shouldn't, but it accidentally works
correctly on `main` because it calls the above method.
This commit is contained in:
JaySpruce 2025-04-14 15:15:33 -05:00 committed by François Mockers
parent 2a2ce6e0ba
commit fa480cded7
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/bevy_ecs/src/hierarchy.rs
View File

@ -12,7 +12,7 @@ use crate::{
bundle::Bundle, bundle::Bundle,
component::{Component, HookContext}, component::{Component, HookContext},
entity::Entity, entity::Entity,
relationship::{RelatedSpawner, RelatedSpawnerCommands, Relationship}, relationship::{RelatedSpawner, RelatedSpawnerCommands},
system::EntityCommands, system::EntityCommands,
world::{DeferredWorld, EntityWorldMut, FromWorld, World}, world::{DeferredWorld, EntityWorldMut, FromWorld, World},
}; };
@ -88,6 +88,8 @@ use log::warn;
/// assert_eq!(&**world.entity(root).get::<Children>().unwrap(), &[child1, child2]); /// assert_eq!(&**world.entity(root).get::<Children>().unwrap(), &[child1, child2]);
/// assert_eq!(&**world.entity(child1).get::<Children>().unwrap(), &[grandchild]); /// assert_eq!(&**world.entity(child1).get::<Children>().unwrap(), &[grandchild]);
/// ``` /// ```
///
/// [`Relationship`]: crate::relationship::Relationship
#[derive(Component, Clone, PartialEq, Eq, Debug)] #[derive(Component, Clone, PartialEq, Eq, Debug)]
#[cfg_attr(feature = "bevy_reflect", derive(bevy_reflect::Reflect))] #[cfg_attr(feature = "bevy_reflect", derive(bevy_reflect::Reflect))]
#[cfg_attr( #[cfg_attr(
@ -141,6 +143,7 @@ impl FromWorld for ChildOf {
/// using the [`IntoIterator`] trait. /// using the [`IntoIterator`] trait.
/// For more complex access patterns, see the [`RelationshipTarget`] trait. /// For more complex access patterns, see the [`RelationshipTarget`] trait.
/// ///
/// [`Relationship`]: crate::relationship::Relationship
/// [`RelationshipTarget`]: crate::relationship::RelationshipTarget /// [`RelationshipTarget`]: crate::relationship::RelationshipTarget
#[derive(Component, Default, Debug, PartialEq, Eq)] #[derive(Component, Default, Debug, PartialEq, Eq)]
#[relationship_target(relationship = ChildOf, linked_spawn)] #[relationship_target(relationship = ChildOf, linked_spawn)]
@ -387,13 +390,13 @@ impl<'a> EntityCommands<'a> {
/// # Panics /// # Panics
/// ///
/// Panics when debug assertions are enabled if an invariant is is broken and the command is executed. /// Panics when debug assertions are enabled if an invariant is is broken and the command is executed.
pub fn replace_children_with_difference<R: Relationship>( pub fn replace_children_with_difference(
&mut self, &mut self,
entities_to_unrelate: &[Entity], entities_to_unrelate: &[Entity],
entities_to_relate: &[Entity], entities_to_relate: &[Entity],
newly_related_entities: &[Entity], newly_related_entities: &[Entity],
) -> &mut Self { ) -> &mut Self {
self.replace_related_with_difference::<R>( self.replace_related_with_difference::<ChildOf>(
entities_to_unrelate, entities_to_unrelate,
entities_to_relate, entities_to_relate,
newly_related_entities, newly_related_entities,

2
crates/bevy_ecs/src/relationship/related_methods.rs
View File

@ -413,7 +413,7 @@ impl<'a> EntityCommands<'a> {
let newly_related_entities: Box<[Entity]> = newly_related_entities.into(); let newly_related_entities: Box<[Entity]> = newly_related_entities.into();
self.queue(move |mut entity: EntityWorldMut| { self.queue(move |mut entity: EntityWorldMut| {
entity.replace_children_with_difference( entity.replace_related_with_difference::<R>(
&entities_to_unrelate, &entities_to_unrelate,
&entities_to_relate, &entities_to_relate,
&newly_related_entities, &newly_related_entities,