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

Clean up presence/persistence logic for /into_npc

Browse Source
This commit is contained in:
juliancoffee 2024-02-02 16:22:51 +02:00
parent dab058740b
commit 4067cd783a
1 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
server/src/cmd.rs
View File

@ -678,37 +678,6 @@ fn handle_into_npc(
args: Vec<String>,
action: &ServerChatCommand,
) -> CmdResult<()> {
// Black magic
let id_to_drop = {
let ecs = server.state.ecs();
let presences = ecs.read_storage::<Presence>();
let presence = presences.get(target);
if let Some(PresenceKind::Character(character_id)) = presence.map(|p| p.kind) {
Some(character_id)
} else {
None
}
};
{
if let Some(id) = id_to_drop {
server
.state
.mut_resource::<IdMaps>()
.remove_entity(Some(target), None, Some(id), None);
}
}
{
let ecs_mut = server.state.ecs_mut();
let mut presences = ecs_mut.write_storage::<Presence>();
if let Some(presence) = presences.get_mut(target) {
presence.kind = PresenceKind::Possessor;
}
}
// End of black magic
if client != target {
server.notify_client(
client,
@ -802,6 +771,26 @@ fn handle_into_npc(
},
}
// Black magic
//
// Mainly needed to disable persistence
{
let ecs = server.state.ecs();
let mut presences = ecs.write_storage::<Presence>();
let presence = presences.get_mut(target);
if let Some(presence) = presence && let PresenceKind::Character(id) = presence.kind {
server.state.ecs().write_resource::<IdMaps>().remove_entity(
Some(target),
None,
Some(id),
None,
);
presence.kind = PresenceKind::Possessor;
}
}
// End of black magic
Ok(())
}