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 code

Browse Source
This commit is contained in:
TelepathicWalrus 2023-05-06 10:49:32 +01:00 committed by Maxicarlos08
parent 6a080c242c
commit 6adca217fe
No known key found for this signature in database
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,7 +136,8 @@ pub fn handle_mount(server: &mut Server, rider: EcsEntity, mount: EcsEntity) {
.ecs() .ecs()
.read_storage::<PetState>() .read_storage::<PetState>()
.get(mount) .get(mount)
.and_then(|x| x.stay_pos).is_some(); .and_then(|x| x.stay_pos)
.is_some();
if (is_pet_of(mount, rider_uid) || is_pet_of(rider, mount_uid)) && can_ride && !is_stay { if (is_pet_of(mount, rider_uid) || is_pet_of(rider, mount_uid)) && can_ride && !is_stay {
drop(uids); drop(uids);
@ -230,8 +231,10 @@ pub fn handle_toggle_stay(server: &mut Server, command_giver: EcsEntity, pet: Ec
if prev_pet_pos.is_none() { if prev_pet_pos.is_none() {
new_pet_pos = state.ecs().read_storage::<Pos>().get(pet).copied(); new_pet_pos = state.ecs().read_storage::<Pos>().get(pet).copied();
} }
if is_owner && within_mounting_range(positions.get(command_giver), positions.get(pet)) if is_owner
&& state.ecs().read_storage::<Is<Mount>>().get(pet).is_none() { && within_mounting_range(positions.get(command_giver), positions.get(pet))
&& state.ecs().read_storage::<Is<Mount>>().get(pet).is_none()
{
let _ = state let _ = state
.ecs() .ecs()
.write_storage::<PetState>() .write_storage::<PetState>()