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

fix: deny gliding/jumping/rolling under water

Browse Source
This commit is contained in:
timokoesters 2020-03-10 19:00:49 +01:00
parent 70027da9aa
commit 0ce451a8b1
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,7 +159,11 @@ pub fn handle_unwield(data: &JoinData, update: &mut StateUpdate) {
/// Checks that player can glide and updates `CharacterState` if so
pub fn handle_glide(data: &JoinData, update: &mut StateUpdate) {
if let CharacterState::Idle { .. } | CharacterState::Wielding { .. } = update.character {
if data.inputs.glide.is_pressed() && !data.physics.on_ground && data.body.is_humanoid() {
if data.inputs.glide.is_pressed()
&& !data.physics.on_ground
&& !data.physics.in_fluid
&& data.body.is_humanoid()
{
update.character = CharacterState::Glide {};
}
}
@ -167,7 +171,7 @@ pub fn handle_glide(data: &JoinData, update: &mut StateUpdate) {
/// Checks that player can jump and sends jump event if so
pub fn handle_jump(data: &JoinData, update: &mut StateUpdate) {
if data.inputs.jump.is_pressed() && data.physics.on_ground {
if data.inputs.jump.is_pressed() && data.physics.on_ground && !data.physics.in_fluid {
update
.local_events
.push_front(LocalEvent::Jump(data.entity));
@ -214,6 +218,7 @@ pub fn handle_dodge_input(data: &JoinData, update: &mut StateUpdate) {
if let CharacterState::Idle { .. } | CharacterState::Wielding { .. } = update.character {
if data.inputs.roll.is_pressed()
&& data.physics.on_ground
&& !data.physics.in_fluid
&& data.body.is_humanoid()
&& update
.energy