mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 19:02:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mcpe-1.2

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-08-23 13:20:35 +01:00
parent da4c9cf404 84c8ac03fb
commit 95752ef542
12 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -300,8 +300,6 @@ abstract class Entity extends Location implements Metadatable{
public $height;
/** @var float */
public $width;
/** @var float */
public $length;
/** @var float */
protected $baseOffset = 0.0;
@ -1352,9 +1350,9 @@ abstract class Entity extends Location implements Metadatable{
final public function hasMovementUpdate() : bool{
return (
$this->forceMovementUpdate or
abs($this->motionX) > self::MOTION_THRESHOLD or
abs($this->motionY) > self::MOTION_THRESHOLD or
abs($this->motionZ) > self::MOTION_THRESHOLD or
$this->motionX != 0 or
$this->motionY != 0 or
$this->motionZ != 0 or
!$this->onGround
);
}