Merge branch '1.9.4' of https://github.com/squeek502/Squake into 1.10.2

This commit is contained in:
Ryan Liptak 2017-07-14 20:31:52 -07:00
commit 5082633bb2

View File

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