Merge branch '3.5'

This commit is contained in:
Dylan K. Taylor
2019-01-19 16:24:41 +00:00
5 changed files with 34 additions and 16 deletions

View File

@ -50,7 +50,7 @@ class Water extends Liquid{
public function onEntityCollide(Entity $entity) : void{
$entity->resetFallDistance();
if($entity->fireTicks > 0){
if($entity->isOnFire()){
$entity->extinguish();
}