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

Fix compilation errors from recent changes

Browse Source
This commit is contained in:
Imbris
2023-05-30 23:13:13 -04:00
parent c60f994c7f
commit a8fbfc026a
5 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/state_ext.rs
View File

@ -702,7 +702,7 @@ impl StateExt for State {
let result =
if let Some(presence) = self.ecs().write_storage::<Presence>().get_mut(entity) {
if let PresenceKind::LoadingCharacter(id) = presence.kind {
*presence.kind = PresenceKind::Character(id);
presence.kind = PresenceKind::Character(id);
Ok(())
} else {
Err("PresenceKind is not LoadingCharacter")
@ -1196,14 +1196,14 @@ impl StateExt for State {
self.ecs().write_resource::<IdMaps>().remove_entity(
Some(entity),
uid,
maybe_presence.and_then(|p| match p.kind {
maybe_presence.and_then(|p| match p {
PresenceKind::Spectator
| PresenceKind::Possessed
| PresenceKind::Possessor
| PresenceKind::LoadingCharacter(_) => None,
PresenceKind::Character(id) => Some(id),
}),
maybe_rtsim_entity,
)
);
} else {
error!("Deleting entity without Uid component");
}