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

Entity: some minor cleanup to constructor

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-03-24 11:52:23 +00:00
parent 071aa44d29
commit eb9f60f41c
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -374,11 +374,11 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
public $lastZ = null; public $lastZ = null;
/** @var float */ /** @var float */
public $motionX; public $motionX = 0.0;
/** @var float */ /** @var float */
public $motionY; public $motionY = 0.0;
/** @var float */ /** @var float */
public $motionZ; public $motionZ = 0.0;
/** @var Vector3 */ /** @var Vector3 */
public $temporalVector; public $temporalVector;
/** @var float */ /** @var float */
@ -492,37 +492,32 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
$this->id = Entity::$entityCount++; $this->id = Entity::$entityCount++;
$this->namedtag = $nbt; $this->namedtag = $nbt;
$this->server = $level->getServer();
/** @var float[] $pos */ /** @var float[] $pos */
$pos = $this->namedtag->getListTag("Pos")->getAllValues(); $pos = $this->namedtag->getListTag("Pos")->getAllValues();
/** @var float[] $rotation */
$rotation = $this->namedtag->getListTag("Rotation")->getAllValues();
$this->chunk = $level->getChunk(((int) floor($pos[0])) >> 4, ((int) floor($pos[2])) >> 4, true); parent::__construct($pos[0], $pos[1], $pos[2], $rotation[0], $rotation[1], $level);
assert(!is_nan($this->x) and !is_infinite($this->x) and !is_nan($this->y) and !is_infinite($this->y) and !is_nan($this->z) and !is_infinite($this->z));
$this->boundingBox = new AxisAlignedBB(0, 0, 0, 0, 0, 0);
$this->recalculateBoundingBox();
$this->chunk = $this->level->getChunk($this->getFloorX() >> 4, $this->getFloorZ() >> 4, false);
if($this->chunk === null){ if($this->chunk === null){
throw new \InvalidStateException("Cannot create entities in unloaded chunks"); throw new \InvalidStateException("Cannot create entities in unloaded chunks");
} }
$this->setLevel($level);
$this->server = $level->getServer();
$this->boundingBox = new AxisAlignedBB(0, 0, 0, 0, 0, 0);
/** @var float[] $rotation */
$rotation = $this->namedtag->getListTag("Rotation")->getAllValues();
$this->setPositionAndRotation($this->temporalVector->setComponents(...$pos), ...$rotation);
/** @var float[] $motion */
$motion = [0, 0, 0];
if($this->namedtag->hasTag("Motion", ListTag::class)){ if($this->namedtag->hasTag("Motion", ListTag::class)){
/** @var float[] $motion */
$motion = $this->namedtag->getListTag("Motion")->getAllValues(); $motion = $this->namedtag->getListTag("Motion")->getAllValues();
$this->setMotion($this->temporalVector->setComponents(...$motion));
} }
$this->setMotion($this->temporalVector->setComponents(...$motion));
$this->resetLastMovements(); $this->resetLastMovements();
assert(!is_nan($this->x) and !is_infinite($this->x) and !is_nan($this->y) and !is_infinite($this->y) and !is_nan($this->z) and !is_infinite($this->z));
$this->fallDistance = $this->namedtag->getFloat("FallDistance", 0.0); $this->fallDistance = $this->namedtag->getFloat("FallDistance", 0.0);
$this->propertyManager = new DataPropertyManager(); $this->propertyManager = new DataPropertyManager();