From 2b30ef16718542a20ce89f44013e42140277400e Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Fri, 20 Jul 2018 11:55:10 +0100
Subject: [PATCH] Revert "Living: fix knockback condition, take 2"

This reverts commit 0081e30a896a730f9598353353f6ee258803850e.

The logic introduced by this commit is correct in MC JAVA 1.9+. Unfortunately, nobody likes 1.9+ for combat.
Some testing in MCPE vanilla made it apparent that this logic isn't correct for MCPE. The old logic is correct for pre-1.9 knockback.
---
 src/pocketmine/entity/Living.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/pocketmine/entity/Living.php b/src/pocketmine/entity/Living.php
index ce0e7a5eb..09a5b986a 100644
--- a/src/pocketmine/entity/Living.php
+++ b/src/pocketmine/entity/Living.php
@@ -575,17 +575,14 @@ 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($this->onGround){
-				$motion->y /= 2;
-				$motion->y += $base;
-
-				if($motion->y > 0.4){ //this is hardcoded in vanilla
-					$motion->y = 0.4;
-				}
+			if($motion->y > $base){
+				$motion->y = $base;
 			}
 
 			$this->setMotion($motion);