From c4f461f65d71efc0b5e0ca00c49e3c4b97c57757 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Fri, 5 May 2017 10:41:44 +0100
Subject: [PATCH] Fixed fall damage in 1 block of water, close #470

---
 src/pocketmine/entity/Entity.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php
index 094e80ea5..6eebae055 100644
--- a/src/pocketmine/entity/Entity.php
+++ b/src/pocketmine/entity/Entity.php
@@ -1301,6 +1301,8 @@ abstract class Entity extends Location implements Metadatable{
 			return true;
 		}
 
+		$this->blocksAround = null;
+
 		if($this->keepMovement){
 			$this->boundingBox->offset($dx, $dy, $dz);
 			$this->setPosition($this->temporalVector->setComponents(($this->boundingBox->minX + $this->boundingBox->maxX) / 2, $this->boundingBox->minY, ($this->boundingBox->minZ + $this->boundingBox->maxZ) / 2));
@@ -1429,7 +1431,7 @@ abstract class Entity extends Location implements Metadatable{
 			$this->z = ($this->boundingBox->minZ + $this->boundingBox->maxZ) / 2;
 
 			$this->checkChunks();
-
+			$this->checkBlockCollision();
 			$this->checkGroundState($movX, $movY, $movZ, $dx, $dy, $dz);
 			$this->updateFallState($dy, $this->onGround);