mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-25 23:07:09 +00:00
Code Issues Projects Releases Wiki Activity

Entity: remove usages of Chunk->getX()/getZ()

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-07-08 20:29:30 +01:00
parent 92f6967665
commit 31fd427710
1 changed files with 9 additions and 1 deletions

10
src/entity/Entity.php

@ -97,6 +97,10 @@ abstract class Entity{
/** @var Chunk|null */ /** @var Chunk|null */
public $chunk; public $chunk;
/** @var int */
private $chunkX;
/** @var int */
private $chunkZ;
/** @var EntityDamageEvent|null */ /** @var EntityDamageEvent|null */
protected $lastDamageCause = null; protected $lastDamageCause = null;
@ -239,6 +243,8 @@ abstract class Entity{
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->chunkX = $this->location->getFloorX() >> 4;
$this->chunkZ = $this->location->getFloorZ() >> 4;
if($nbt !== null){ if($nbt !== null){
$this->motion = EntityDataHelper::parseVec3($nbt, "Motion", true); $this->motion = EntityDataHelper::parseVec3($nbt, "Motion", true);
@ -1335,11 +1341,13 @@ abstract class Entity{
protected function checkChunks() : void{ protected function checkChunks() : void{
$chunkX = $this->location->getFloorX() >> 4; $chunkX = $this->location->getFloorX() >> 4;
$chunkZ = $this->location->getFloorZ() >> 4; $chunkZ = $this->location->getFloorZ() >> 4;
if($this->chunk === null or ($this->chunk->getX() !== $chunkX or $this->chunk->getZ() !== $chunkZ)){ if($this->chunk === null or $chunkX !== $this->chunkX or $chunkZ !== $this->chunkZ){
if($this->chunk !== null){ if($this->chunk !== null){
$this->chunk->removeEntity($this); $this->chunk->removeEntity($this);
} }
$this->chunk = $this->getWorld()->getChunk($chunkX, $chunkZ, true); $this->chunk = $this->getWorld()->getChunk($chunkX, $chunkZ, true);
$this->chunkX = $chunkX;
$this->chunkZ = $chunkZ;
if(!$this->justCreated){ if(!$this->justCreated){
$newChunk = $this->getWorld()->getViewersForPosition($this->location); $newChunk = $this->getWorld()->getViewersForPosition($this->location);