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

Merge branch 'x7cfe/fix_npc_goto_jump' into 'master'

Browse Source 
Fix accidental jump cancellation during dispatch of `NpcActivity::Goto`

See merge request veloren/veloren!4406
This commit is contained in:
Joshua Barretto 2024-04-02 20:28:40 +00:00
commit 302e2e92b0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/agent/src/action_nodes.rs
View File

@ -165,7 +165,10 @@ impl<'a> AgentData<'a> {
let climbing_out_of_water = self.physics_state.in_liquid().map_or(false, |h| h < 1.0)
&& bearing.z > 0.0
&& self.physics_state.on_wall.is_some();
self.jump_if(bearing.z > 1.5 || climbing_out_of_water, controller);
self.jump_if(
bearing.z > 1.5 || climbing_out_of_water || self.traversal_config.can_fly,
controller,
);
controller.inputs.move_z = bearing.z;
if bearing.z > 0.0 {
controller.inputs.climb = Some(comp::Climb::Up);
@ -285,7 +288,6 @@ impl<'a> AgentData<'a> {
},
) {
self.traverse(controller, bearing, speed.min(speed_factor));
self.jump_if(self.traversal_config.can_fly, controller);
let height_offset = bearing.z
+ if self.traversal_config.can_fly {