mirror of
https://github.com/bevyengine/bevy
synced 2024-11-22 04:33:37 +00:00
Don't panic when despawning entity multiple times (#649)
Emit a debug log message instead of a panic when despawning an entity which has already been despawned.
This commit is contained in:
parent
ebce1f9c4a
commit
bf501b77cc
2 changed files with 16 additions and 1 deletions
|
@ -13,9 +13,11 @@
|
|||
- This allows drop-in use of colors from most applications.
|
||||
- New methods `Color::rgb_linear` and `Color::rgba_linear` will accept colors already in linear sRGB (the old behavior)
|
||||
- Individual color-components must now be accessed through setters and getters: `.r`, `.g`, `.b`, `.a`, `.set_r`, `.set_g`, `.set_b`, `.set_a`, and the corresponding methods with the `*_linear` suffix.
|
||||
- Despawning an entity multiple times causes a debug-level log message to be emitted instead of a panic [649]
|
||||
|
||||
[552]: https://github.com/bevyengine/bevy/pull/552
|
||||
[616]: https://github.com/bevyengine/bevy/pull/616
|
||||
[649]: https://github.com/bevyengine/bevy/pull/649
|
||||
|
||||
## Version 0.2.1 (2020-9-20)
|
||||
|
||||
|
|
|
@ -72,7 +72,9 @@ pub(crate) struct Despawn {
|
|||
|
||||
impl WorldWriter for Despawn {
|
||||
fn write(self: Box<Self>, world: &mut World) {
|
||||
world.despawn(self.entity).unwrap();
|
||||
if let Err(e) = world.despawn(self.entity) {
|
||||
log::debug!("Failed to despawn entity {:?}: {}", self.entity, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -385,6 +387,7 @@ mod tests {
|
|||
let mut command_buffer = Commands::default();
|
||||
command_buffer.set_entity_reserver(world.get_entity_reserver());
|
||||
command_buffer.spawn((1u32, 2u64));
|
||||
let entity = command_buffer.current_entity().unwrap();
|
||||
command_buffer.insert_resource(3.14f32);
|
||||
command_buffer.apply(&mut world, &mut resources);
|
||||
let results = world
|
||||
|
@ -394,5 +397,15 @@ mod tests {
|
|||
.collect::<Vec<_>>();
|
||||
assert_eq!(results, vec![(1u32, 2u64)]);
|
||||
assert_eq!(*resources.get::<f32>().unwrap(), 3.14f32);
|
||||
// test entity despawn
|
||||
command_buffer.despawn(entity);
|
||||
command_buffer.despawn(entity); // double despawn shouldn't panic
|
||||
command_buffer.apply(&mut world, &mut resources);
|
||||
let results2 = world
|
||||
.query::<(&u32, &u64)>()
|
||||
.iter()
|
||||
.map(|(a, b)| (*a, *b))
|
||||
.collect::<Vec<_>>();
|
||||
assert_eq!(results2, vec![]);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue