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

Address review on !3971

Browse Source
This commit is contained in:
Imbris
2023-06-04 18:10:20 -04:00
parent 9a12de5fcf
commit 599e25c9c6
3 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/state_ext.rs
View File

@ -715,6 +715,7 @@ impl StateExt for State {
if let Err(err) = result {
let err = format!("Unexpected state when applying loaded character info: {err}");
error!("{err}");
// TODO: we could produce a `comp::Content` for this to allow localization.
return Err(err);
}
@ -1225,12 +1226,7 @@ impl StateExt for State {
// We don't want to pass in the Uid from exit_ingame since it has already
// been mapped to another entity.
maybe_uid,
maybe_presence.and_then(|p| match p {
PresenceKind::Spectator
| PresenceKind::Possessor
| PresenceKind::LoadingCharacter(_) => None,
PresenceKind::Character(id) => Some(id),
}),
maybe_presence.and_then(|p| p.character_id()),
maybe_rtsim_entity,
);