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

handle despawn better

Browse Source
This commit is contained in:
Elliott Pierce 2025-06-01 08:07:36 -04:00
parent 866476e851
commit 531658cf4f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/bevy_ecs/src/world/entity_ref.rs
View File

@ -2377,15 +2377,16 @@ impl<'w> EntityWorldMut<'w> {
#[track_caller] #[track_caller]
pub fn destruct(&mut self) -> &mut Self { pub fn destruct(&mut self) -> &mut Self {
self.destruct_with_caller(MaybeLocation::caller()); self.destruct_with_caller(MaybeLocation::caller());
self.update_location(); // In case some command re-constructs this entity.
self self
} }
/// Returns whether or not it really did need to destruct. /// Returns whether or not it really did need to destruct.
pub(crate) fn destruct_with_caller(&mut self, caller: MaybeLocation) -> bool { pub(crate) fn destruct_with_caller(&mut self, caller: MaybeLocation) {
// setup // setup
let Some(location) = self.location else { let Some(location) = self.location else {
// If there is no location, we are already destructed // If there is no location, we are already destructed
return false; return;
}; };
let archetype = &self.world.archetypes[location.archetype_id]; let archetype = &self.world.archetypes[location.archetype_id];
@ -2523,8 +2524,6 @@ impl<'w> EntityWorldMut<'w> {
// SAFETY: We just destructed it. // SAFETY: We just destructed it.
self.entity = unsafe { self.world.entities.mark_free(self.entity.row(), 1) }; self.entity = unsafe { self.world.entities.mark_free(self.entity.row(), 1) };
self.world.flush(); self.world.flush();
self.update_location(); // In case some command re-constructs this entity.
true
} }
/// Despawns the current entity. /// Despawns the current entity.
@ -2541,9 +2540,14 @@ impl<'w> EntityWorldMut<'w> {
} }
pub(crate) fn despawn_with_caller(mut self, caller: MaybeLocation) { pub(crate) fn despawn_with_caller(mut self, caller: MaybeLocation) {
if self.destruct_with_caller(caller) { self.destruct_with_caller(caller);
if let Ok(None) = self.world.entities.get(self.entity) {
self.world.allocator.free(self.entity); self.world.allocator.free(self.entity);
} }
// Otherwise:
// A command must have reconstructed it (had a location); don't free
// A command must have already despawned it (err) or otherwise made the free unneeded (ex by constructing and destructing in commands); don't free
} }
/// Ensures any commands triggered by the actions of Self are applied, equivalent to [`World::flush`] /// Ensures any commands triggered by the actions of Self are applied, equivalent to [`World::flush`]
@ -2626,7 +2630,7 @@ impl<'w> EntityWorldMut<'w> {
/// This is *only* required when using the unsafe function [`EntityWorldMut::world_mut`], /// This is *only* required when using the unsafe function [`EntityWorldMut::world_mut`],
/// which enables the location to change. /// which enables the location to change.
pub fn update_location(&mut self) { pub fn update_location(&mut self) {
self.location = self.world.entities().get(self.entity).unwrap_or_default(); self.location = self.world.entities().get(self.entity).expect("Commands should not be queued which despawn an entity while an active `EntityWorldMut` is available to do so.");
} }
/// Returns if the entity has been despawned. /// Returns if the entity has been despawned.