AstralTransRocketries/Squake
1
0
Fork 0
mirror of https://github.com/squeek502/Squake.git synced 2025-08-03 17:58:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.7.x' of https://github.com/squeek502/Squake into 1.8

Browse Source
This commit is contained in:
Ryan Liptak 2017-07-14 20:30:16 -07:00
commit 2a3e00e48d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/squeek/quakemovement/QuakeClientPlayer.java
View File

@ -102,7 +102,7 @@ public class QuakeClientPlayer extends ClientPlayerBase
@Override @Override
public void moveFlying(float sidemove, float forwardmove, float wishspeed) public void moveFlying(float sidemove, float forwardmove, float wishspeed)
{ {
if ((this.player.capabilities.isFlying && this.player.ridingEntity == null) || this.player.isInWater()) if ((this.player.capabilities.isFlying && this.player.ridingEntity == null) || this.player.isInWater() || this.player.isInLava())
{ {
super.moveFlying(sidemove, forwardmove, wishspeed); super.moveFlying(sidemove, forwardmove, wishspeed);
return; return;