Merge commit '4199c3796f4c6d8da0eccba64fe4cd9812acadeb'

# Conflicts:
#	resources/vanilla
#	src/pocketmine/block/Water.php
This commit is contained in:
Dylan K. Taylor 2020-05-31 14:46:51 +01:00
commit 0a730db030

View File

@ -51,7 +51,5 @@ class Water extends Liquid{
if($entity->isOnFire()){
$entity->extinguish();
}
$entity->resetFallDistance();
}
}