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

Check for existing target before initiating interaction

Browse Source
This commit is contained in:
Bryant Deters 2021-08-21 22:28:26 -05:00
parent 4d62b9b937
commit 5983c87120
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/events/interaction.rs
View File

@ -87,6 +87,7 @@ pub fn handle_npc_interaction(server: &mut Server, interactor: EcsEntity, npc_en
.write_storage::<comp::Agent>() .write_storage::<comp::Agent>()
.get_mut(npc_entity) .get_mut(npc_entity)
{ {
if agent.target.is_none() {
if let Some(interactor_uid) = state.ecs().uid_from_entity(interactor) { if let Some(interactor_uid) = state.ecs().uid_from_entity(interactor) {
agent agent
.inbox .inbox
@ -94,6 +95,7 @@ pub fn handle_npc_interaction(server: &mut Server, interactor: EcsEntity, npc_en
} }
} }
} }
}
/// FIXME: Make mounting more robust, avoid bidirectional links. /// FIXME: Make mounting more robust, avoid bidirectional links.
pub fn handle_mount(server: &mut Server, mounter: EcsEntity, mountee: EcsEntity) { pub fn handle_mount(server: &mut Server, mounter: EcsEntity, mountee: EcsEntity) {