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

Refactor Block & Tile: getPos() to getPosition() (#4395)

Browse Source 
this also changes the name of the class property 'pos' to 'position' as well as Block->getPosOffset() to Block->getPositionOffset()
This commit is contained in:
SalmonDE
2021-08-23 15:01:32 +02:00
committed by GitHub
parent 22316976fa
commit 7fd712c1ff
93 changed files with 402 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/block/tile/Tile.php
View File

@ -46,14 +46,14 @@ abstract class Tile{
public const TAG_Z = "z";
/** @var Position */
protected $pos;
protected $position;
/** @var bool */
public $closed = false;
/** @var TimingsHandler */
protected $timings;
public function __construct(World $world, Vector3 $pos){
$this->pos = Position::fromObject($pos, $world);
$this->position = Position::fromObject($pos, $world);
$this->timings = Timings::getTileEntityTimings($this);
}
@ -72,9 +72,9 @@ abstract class Tile{
public function saveNBT() : CompoundTag{
$nbt = CompoundTag::create()
->setString(self::TAG_ID, TileFactory::getInstance()->getSaveId(get_class($this)))
->setInt(self::TAG_X, $this->pos->getFloorX())
->setInt(self::TAG_Y, $this->pos->getFloorY())
->setInt(self::TAG_Z, $this->pos->getFloorZ());
->setInt(self::TAG_X, $this->position->getFloorX())
->setInt(self::TAG_Y, $this->position->getFloorY())
->setInt(self::TAG_Z, $this->position->getFloorZ());
$this->writeSaveData($nbt);
return $nbt;
@ -97,11 +97,11 @@ abstract class Tile{
}
public function getBlock() : Block{
return $this->pos->getWorld()->getBlock($this->pos);
return $this->position->getWorld()->getBlock($this->position);
}
public function getPos() : Position{
return $this->pos;
public function getPosition() : Position{
return $this->position;
}
public function isClosed() : bool{
@ -131,8 +131,8 @@ abstract class Tile{
if(!$this->closed){
$this->closed = true;
if($this->pos->isValid()){
$this->pos->getWorld()->removeTile($this);
if($this->position->isValid()){
$this->position->getWorld()->removeTile($this);
}
}
}