Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zesterer/fix-pet-panic' into 'master'

Browse Source 
Fixed potential panic when adding dead pet

See merge request veloren/veloren!4141
This commit is contained in:
Joshua Barretto
2023-10-16 10:30:35 +00:00
parent 912002bd0c 285a0b2b01
commit afb79bf67a
1 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/comp/group.rs
View File

@ -264,10 +264,16 @@ impl GroupManager {
uids: &Uids,
notifier: &mut impl FnMut(specs::Entity, ChangeNotification<specs::Entity>),
) {
if !entities.is_alive(owner) {
warn!("Tried to create new pet for non-existent owner {owner:?}");
} else if !entities.is_alive(pet) {
warn!("Tried to create new pet for non-existent pet {pet:?}");
} else {
let group = match groups.get(owner).copied() {
Some(group) => group,
None => {
let new_group = self.create_group(owner, 1);
// Unwrap can't fail, we checked that `owner` is alive above
groups.insert(owner, new_group).unwrap();
// Inform
notifier(owner, ChangeNotification::NewLeader(owner));
@ -284,8 +290,10 @@ impl GroupManager {
});
// Add
// Unwrap can't fail, we checked that `pet` is alive above
groups.insert(pet, group).unwrap();
}
}
pub fn leave_group(
&mut self,