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 'knightresspaladin/fix-melee-leap' into 'master'

Browse Source 
Added check to prevent melee leaps from stalling in liquids

See merge request veloren/veloren!2584
This commit is contained in:
Samuel Keiffer 2021-07-09 15:02:13 +00:00
commit b725cf57bb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/states/leap_melee.rs
View File

@ -101,7 +101,7 @@ impl CharacterBehavior for Data {
timer: tick_attack_or_default(data, self.timer, None),
..*self
});
} else if data.physics.on_ground.is_some() {
} else if data.physics.on_ground.is_some() | data.physics.in_liquid().is_some() {
// Transitions to swing portion of state upon hitting ground
update.character = CharacterState::LeapMelee(Data {
timer: Duration::default(),