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 'fixing-character-deletion' into 'master'

Browse Source 
Server: Fix character deletion mentioned in #1327

See merge request veloren/veloren!2818
This commit is contained in:
Ben Wallis 2021-09-06 13:40:01 +00:00
commit a19f1dfc14
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/src/persistence/character.rs
View File

@ -544,6 +544,14 @@ pub fn delete_character(
stmt.execute(&[&char_id])?; stmt.execute(&[&char_id])?;
drop(stmt); drop(stmt);
let pet_ids = get_pet_ids(char_id, transaction)?
.iter()
.map(|x| Value::from(*x))
.collect::<Vec<Value>>();
if !pet_ids.is_empty() {
delete_pets(transaction, char_id, Rc::new(pet_ids))?;
}
// Delete character // Delete character
let mut stmt = transaction.prepare_cached( let mut stmt = transaction.prepare_cached(
" "
@ -598,14 +606,6 @@ pub fn delete_character(
))); )));
} }
let pet_ids = get_pet_ids(char_id, transaction)?
.iter()
.map(|x| Value::from(*x))
.collect::<Vec<Value>>();
if !pet_ids.is_empty() {
delete_pets(transaction, char_id, Rc::new(pet_ids))?;
}
load_character_list(requesting_player_uuid, transaction) load_character_list(requesting_player_uuid, transaction)
} }