Merge branch 'release/3.1' into release/3.2

This commit is contained in:
Dylan K. Taylor
2018-09-08 14:25:11 +01:00
10 changed files with 50 additions and 61 deletions

View File

@ -408,8 +408,6 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
public $boundingBox;
/** @var bool */
public $onGround;
/** @var int */
protected $age = 0;
/** @var float */
public $eyeHeight = null;
@ -1041,7 +1039,6 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
}
}
$this->age += $tickDiff;
$this->ticksLived += $tickDiff;
return $hasUpdate;