diff --git a/src/pocketmine/entity/Living.php b/src/pocketmine/entity/Living.php
index 6202e9ee4..bb39d4c5c 100644
--- a/src/pocketmine/entity/Living.php
+++ b/src/pocketmine/entity/Living.php
@@ -577,14 +577,17 @@ abstract class Living extends Entity implements Damageable{
 			$motion = clone $this->motion;
 
 			$motion->x /= 2;
-			$motion->y /= 2;
 			$motion->z /= 2;
 			$motion->x += $x * $f * $base;
-			$motion->y += $base;
 			$motion->z += $z * $f * $base;
 
-			if($motion->y > $base){
-				$motion->y = $base;
+			if($this->onGround){
+				$motion->y /= 2;
+				$motion->y += $base;
+
+				if($motion->y > 0.4){ //this is hardcoded in vanilla
+					$motion->y = 0.4;
+				}
 			}
 
 			$this->setMotion($motion);