Merge branch '1.11.2' of https://github.com/squeek502/Squake into 1.12

squeek502 · squeek502 · commit 16f7f5e27bff · 2017-07-14T20:33:49.000-07:00
diff --git a/java/squeek/quakemovement/QuakeClientPlayer.java b/java/squeek/quakemovement/QuakeClientPlayer.java
@@ -113,7 +113,7 @@ public static boolean moveRelative(EntityPlayer player, float sidemove, float up
 		if (!player.world.isRemote)
 			return false;
 
-		if ((player.capabilities.isFlying && player.getRidingEntity() == null) || player.isInWater())
+		if ((player.capabilities.isFlying && player.getRidingEntity() == null) || player.isInWater() || player.isInLava())
 		{
 			return false;
 		}

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public static boolean moveRelative(EntityPlayer player, float sidemove, float up`
`113`	`113`	`if (!player.world.isRemote)`
`114`	`114`	`return false;`
`115`	`115`
`116`		`- if ((player.capabilities.isFlying && player.getRidingEntity() == null) \|\| player.isInWater())`
	`116`	`+ if ((player.capabilities.isFlying && player.getRidingEntity() == null) \|\| player.isInWater() \|\| player.isInLava())`
`117`	`117`	`{`
`118`	`118`	`return false;`
`119`	`119`	`}`