  net/minecraft/client/settings/KeyBinding.java      |   2 +-
  net/minecraft/crash/CrashReport.java               |  25 ++-
  net/minecraft/entity/Entity.java                   | 229 +++++++++++----------
- net/minecraft/entity/EntityLivingBase.java         |  39 ++--
+ net/minecraft/entity/EntityLivingBase.java         |  40 ++--
  net/minecraft/entity/player/EntityPlayer.java      |  40 ++--
  net/minecraft/item/ItemSword.java                  |   2 +-
  net/minecraft/item/ItemTool.java                   |   2 +-

         if (this.isPotionActive(MobEffects.JUMP_BOOST))
         {
             this.motionY += (double)((float)(this.getActivePotionEffect(MobEffects.JUMP_BOOST).getAmplifier() + 1) * 0.1F);
@@ -1966,8 +1967,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)
