mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 01:46:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/3.1' into release/3.2

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-08-22 15:41:52 +01:00
parent d419d4308f 4cc7573a64
commit 8daf3dc8b4
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/entity/Entity.php
View File

@ -1030,8 +1030,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){