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

This commit is contained in:
Ryan Liptak 2017-07-14 20:30:16 -07:00
commit 2a3e00e48d

View File

@ -102,7 +102,7 @@ public class QuakeClientPlayer extends ClientPlayerBase
@Override
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);
return;