Merge branch 'release/3.2'

This commit is contained in:
Dylan K. Taylor
2018-08-22 15:42:00 +01:00
2 changed files with 9 additions and 4 deletions

View File

@ -1010,8 +1010,8 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
$hasUpdate = true;
}
if($this->isOnFire()){
$hasUpdate = ($hasUpdate || $this->doOnFireTick($tickDiff));
if($this->isOnFire() and $this->doOnFireTick($tickDiff)){
$hasUpdate = true;
}
if($this->noDamageTicks > 0){