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

Adds a liveness check for mounting

Browse Source
This commit is contained in:
Snowram 2021-05-16 01:48:14 +02:00 committed by Imbris
parent 09cbb90f61
commit fafb344404
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,8 +113,15 @@ pub fn handle_mount(server: &mut Server, mounter: EcsEntity, mountee: EcsEntity)
state.ecs().read_storage::<comp::Pos>().get(mounter),
state.ecs().read_storage::<comp::Pos>().get(mountee),
);
let alive = |e| {
state
.ecs()
.read_storage::<comp::Health>()
.get(e)
.map_or(true, |h| !h.is_dead)
};
if not_mounting_yet && within_range {
if not_mounting_yet && within_range && alive(mounter) && alive(mountee) {
if let (Some(mounter_uid), Some(mountee_uid)) = (
state.ecs().uid_from_entity(mounter),
state.ecs().uid_from_entity(mountee),