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

Fix panic on is_resource_* calls (#2828) (#2863)

Browse Source 
Changed out unwraps to use if let syntax instead. Returning false when None.

Also modified an existing test to encompass these methods

This PR fixes #2828
This commit is contained in:
Will Dixon 2021-09-24 20:42:58 +00:00
parent b9e0241071
commit d158e0893e
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/bevy_ecs/src/lib.rs
View File

@ -886,6 +886,8 @@ mod tests {
let mut world = World::default(); let mut world = World::default();
assert!(world.get_resource::<i32>().is_none()); assert!(world.get_resource::<i32>().is_none());
assert!(!world.contains_resource::<i32>()); assert!(!world.contains_resource::<i32>());
assert!(!world.is_resource_added::<i32>());
assert!(!world.is_resource_changed::<i32>());
world.insert_resource(123); world.insert_resource(123);
let resource_id = world let resource_id = world
@ -900,6 +902,8 @@ mod tests {
assert_eq!(*world.get_resource::<i32>().expect("resource exists"), 123); assert_eq!(*world.get_resource::<i32>().expect("resource exists"), 123);
assert!(world.contains_resource::<i32>()); assert!(world.contains_resource::<i32>());
assert!(world.is_resource_added::<i32>());
assert!(world.is_resource_changed::<i32>());
world.insert_resource(456u64); world.insert_resource(456u64);
assert_eq!( assert_eq!(

26
crates/bevy_ecs/src/world/mod.rs
View File

@ -664,16 +664,34 @@ impl World {
} }
pub fn is_resource_added<T: Component>(&self) -> bool { pub fn is_resource_added<T: Component>(&self) -> bool {
let component_id = self.components.get_resource_id(TypeId::of::<T>()).unwrap(); let component_id =
let column = self.get_populated_resource_column(component_id).unwrap(); if let Some(component_id) = self.components.get_resource_id(TypeId::of::<T>()) {
component_id
} else {
return false;
};
let column = if let Some(column) = self.get_populated_resource_column(component_id) {
column
} else {
return false;
};
// SAFE: resources table always have row 0 // SAFE: resources table always have row 0
let ticks = unsafe { column.get_ticks_unchecked(0) }; let ticks = unsafe { column.get_ticks_unchecked(0) };
ticks.is_added(self.last_change_tick(), self.read_change_tick()) ticks.is_added(self.last_change_tick(), self.read_change_tick())
} }
pub fn is_resource_changed<T: Component>(&self) -> bool { pub fn is_resource_changed<T: Component>(&self) -> bool {
let component_id = self.components.get_resource_id(TypeId::of::<T>()).unwrap(); let component_id =
let column = self.get_populated_resource_column(component_id).unwrap(); if let Some(component_id) = self.components.get_resource_id(TypeId::of::<T>()) {
component_id
} else {
return false;
};
let column = if let Some(column) = self.get_populated_resource_column(component_id) {
column
} else {
return false;
};
// SAFE: resources table always have row 0 // SAFE: resources table always have row 0
let ticks = unsafe { column.get_ticks_unchecked(0) }; let ticks = unsafe { column.get_ticks_unchecked(0) };
ticks.is_changed(self.last_change_tick(), self.read_change_tick()) ticks.is_changed(self.last_change_tick(), self.read_change_tick())