Merge branch 'stable' into next-minor

# Conflicts:
#	composer.lock

build/php

@@ -1 +1 @@
-Subproject commit a6ab41089e4c2d19b309fe29763f332564b4b662
+Subproject commit d475b694e4889e403fe430b88be9f535b7d4af02

composer.json

@@ -39,9 +39,9 @@
    },
    "require-dev": {
       "phpstan/phpstan": "^0.12.25",
-      "irstea/phpunit-shim": "^8.5",
       "phpstan/phpstan-phpunit": "^0.12.6",
-      "phpstan/phpstan-strict-rules": "^0.12.2"
+      "phpstan/phpstan-strict-rules": "^0.12.2",
+      "phpunit/phpunit": "^8.5"
    },
    "autoload": {
       "psr-4": {

phpstan.neon.dist

@@ -21,7 +21,6 @@ parameters:
 		- src/pocketmine/PocketMine.php
 		- build/make-release.php
 		- build/server-phar.php
-		- vendor/irstea/phpunit-shim/phpunit
 	paths:
 		- src
 		- build/make-release.php

src/pocketmine/Player.php

@@ -3791,6 +3791,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$pk->headYaw = $yaw;
 		$pk->yaw = $yaw;
 		$pk->mode = $mode;
+		$pk->onGround = $this->onGround;
 
 		if($targets !== null){
 			$this->server->broadcastPacket($targets, $pk);

src/pocketmine/block/Water.php

@@ -70,8 +70,6 @@ class Water extends Liquid{
 		if($entity->isOnFire()){
 			$entity->extinguish();
 		}
-
-		$entity->resetFallDistance();
 	}
 
 	public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{

src/pocketmine/entity/Entity.php

@@ -1168,6 +1168,9 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
 		if($teleport){
 			$pk->flags |= MoveActorAbsolutePacket::FLAG_TELEPORT;
 		}
+		if($this->onGround){
+			$pk->flags |= MoveActorAbsolutePacket::FLAG_GROUND;
+		}
 
 		$this->level->broadcastPacketToViewers($this, $pk);
 	}