              public String call() throws Exception
              {
 diff --git a/net/minecraft/entity/EntityLivingBase.java b/net/minecraft/entity/EntityLivingBase.java
-index 24a6e35..4fd9556 100644
+index 24a6e35..63a7e31 100644
 --- a/net/minecraft/entity/EntityLivingBase.java
 +++ b/net/minecraft/entity/EntityLivingBase.java
 @@ -1,14 +1,17 @@

         if (this.isPotionActive(MobEffects.JUMP_BOOST))
         {
             this.motionY += (double)((float)(this.getActivePotionEffect(MobEffects.JUMP_BOOST).getAmplifier() + 1) * 0.1F);
@@ -1887,8 +1888,14 @@ public abstract class EntityLivingBase extends Entity
     {
         if (this.isServerWorld() || this.canPassengerSteer())
         {

+			// TODO: Client
+			if(!this.isInWater()
+				|| WurstClient.INSTANCE.mods.flightMod.isActive()
+				|| WurstClient.INSTANCE.mods.freecamMod.isActive()
+				|| WurstClient.INSTANCE.mods.noSlowdownMod.isActive()
+				|| this instanceof EntityPlayer
+				&& ((EntityPlayer)this).capabilities.isFlying)
