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

Update code quality

Browse Source
This commit is contained in:
TelepathicWalrus 2023-05-13 15:02:55 +01:00 committed by Maxicarlos08
parent 62d998252d
commit 2cb8e2ca84
No known key found for this signature in database
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,7 +139,8 @@ pub fn handle_mount(server: &mut Server, rider: EcsEntity, mount: EcsEntity) {
.and_then(|x| x.stay_pos) .and_then(|x| x.stay_pos)
.is_some(); .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);
let _ = state.link(Mounting { let _ = state.link(Mounting {
mount: mount_uid, mount: mount_uid,

18
server/src/sys/agent/behavior_tree.rs
View File

@ -412,17 +412,23 @@ fn follow_if_far_away(bdata: &mut BehaviorData) -> bool {
let distance_from_stay = stay_pos.0.distance_squared(bdata.agent_data.pos.0); let distance_from_stay = stay_pos.0.distance_squared(bdata.agent_data.pos.0);
if distance_from_stay > (MAX_STAY_DISTANCE).powi(2) { if distance_from_stay > (MAX_STAY_DISTANCE).powi(2) {
bdata bdata.agent_data.follow(
.agent_data bdata.agent,
.follow(bdata.agent, bdata.controller, bdata.read_data, &stay_pos); bdata.controller,
bdata.read_data,
&stay_pos,
);
return true; return true;
} }
} else { } else {
let dist_sqrd = bdata.agent_data.pos.0.distance_squared(tgt_pos.0); let dist_sqrd = bdata.agent_data.pos.0.distance_squared(tgt_pos.0);
if dist_sqrd > (MAX_PATROL_DIST * bdata.agent.psyche.idle_wander_factor).powi(2) { if dist_sqrd > (MAX_PATROL_DIST * bdata.agent.psyche.idle_wander_factor).powi(2) {
bdata bdata.agent_data.follow(
.agent_data bdata.agent,
.follow(bdata.agent, bdata.controller, bdata.read_data, tgt_pos); bdata.controller,
bdata.read_data,
tgt_pos,
);
return true; return true;
} }
} }