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

Fixed roll not returning to wield if initiated from a wielded character state.

Browse Source
This commit is contained in:
Sam 2023-01-28 15:15:35 -05:00
parent f866bc053c
commit 9c43c016a3
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/states/utils.rs
View File

@ -1105,15 +1105,12 @@ fn handle_ability(
} }
} }
update.used_inputs.push(input); update.used_inputs.push(input);
return true;
}
}
if let CharacterState::Roll(roll) = &mut update.character { if let CharacterState::Roll(roll) = &mut update.character {
if let CharacterState::ComboMelee(c) = data.character { if let CharacterState::ComboMelee(c) = data.character {
roll.was_combo = Some((c.static_data.ability_info.input, c.stage)); roll.was_combo = Some((c.static_data.ability_info.input, c.stage));
roll.was_wielded = true; roll.was_wielded = true;
} else { } else {
if data.character.is_wield() { if data.character.is_wield() || data.character.was_wielded() {
roll.was_wielded = true; roll.was_wielded = true;
} }
if data.character.is_stealthy() { if data.character.is_stealthy() {
@ -1121,6 +1118,9 @@ fn handle_ability(
} }
} }
} }
return true;
}
}
false false
} }