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

block: clean up unnecessary getter usages

Browse Source 
with the assistance of a custom phpstan rule
this inconsistent mess has been bothering me for a long time
This commit is contained in:
Dylan K. Taylor 2023-11-14 12:47:33 +00:00
parent e525699dd4
commit dd98e4aaed
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
18 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/block/Bamboo.php
View File

@ -173,7 +173,7 @@ class Bamboo extends Transparent{
$newHeight = $height + $growAmount; $newHeight = $height + $growAmount;
$stemBlock = (clone $this)->setReady(false)->setLeafSize(self::NO_LEAVES); $stemBlock = (clone $this)->setReady(false)->setLeafSize(self::NO_LEAVES);
if($newHeight >= 4 && !$stemBlock->isThick()){ //don't change it to false if height is less, because it might have been chopped if($newHeight >= 4 && !$stemBlock->thick){ //don't change it to false if height is less, because it might have been chopped
$stemBlock = $stemBlock->setThick(true); $stemBlock = $stemBlock->setThick(true);
} }
$smallLeavesBlock = (clone $stemBlock)->setLeafSize(self::SMALL_LEAVES); $smallLeavesBlock = (clone $stemBlock)->setLeafSize(self::SMALL_LEAVES);

8
src/block/Barrel.php
View File

@ -55,12 +55,12 @@ class Barrel extends Opaque{
public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{ public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
if($player !== null){ if($player !== null){
if(abs($player->getPosition()->getX() - $this->position->getX()) < 2 && abs($player->getPosition()->getZ() - $this->position->getZ()) < 2){ if(abs($player->getPosition()->x - $this->position->x) < 2 && abs($player->getPosition()->z - $this->position->z) < 2){
$y = $player->getEyePos()->getY(); $y = $player->getEyePos()->y;
if($y - $this->position->getY() > 2){ if($y - $this->position->y > 2){
$this->facing = Facing::UP; $this->facing = Facing::UP;
}elseif($this->position->getY() - $y > 0){ }elseif($this->position->y - $y > 0){
$this->facing = Facing::DOWN; $this->facing = Facing::DOWN;
}else{ }else{
$this->facing = Facing::opposite($player->getHorizontalFacing()); $this->facing = Facing::opposite($player->getHorizontalFacing());

10
src/block/BaseBigDripleaf.php
View File

@ -65,8 +65,8 @@ abstract class BaseBigDripleaf extends Transparent{
$this->facing = Facing::opposite($player->getHorizontalFacing()); $this->facing = Facing::opposite($player->getHorizontalFacing());
} }
if($block instanceof BaseBigDripleaf){ if($block instanceof BaseBigDripleaf){
$this->facing = $block->getFacing(); $this->facing = $block->facing;
$tx->addBlock($block->getPosition(), VanillaBlocks::BIG_DRIPLEAF_STEM()->setFacing($this->facing)); $tx->addBlock($block->position, VanillaBlocks::BIG_DRIPLEAF_STEM()->setFacing($this->facing));
} }
return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player); return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
} }
@ -98,7 +98,7 @@ abstract class BaseBigDripleaf extends Transparent{
if($head === null){ if($head === null){
return false; return false;
} }
$pos = $head->getPosition(); $pos = $head->position;
$up = $pos->up(); $up = $pos->up();
$world = $pos->getWorld(); $world = $pos->getWorld();
if( if(
@ -110,8 +110,8 @@ abstract class BaseBigDripleaf extends Transparent{
$tx = new BlockTransaction($world); $tx = new BlockTransaction($world);
$tx->addBlock($pos, VanillaBlocks::BIG_DRIPLEAF_STEM()->setFacing($head->getFacing())); $tx->addBlock($pos, VanillaBlocks::BIG_DRIPLEAF_STEM()->setFacing($head->facing));
$tx->addBlock($up, VanillaBlocks::BIG_DRIPLEAF_HEAD()->setFacing($head->getFacing())); $tx->addBlock($up, VanillaBlocks::BIG_DRIPLEAF_HEAD()->setFacing($head->facing));
$ev = new StructureGrowEvent($head, $tx, $player); $ev = new StructureGrowEvent($head, $tx, $player);
$ev->call(); $ev->call();

2
src/block/Bed.php
View File

@ -145,7 +145,7 @@ class Bed extends Transparent{
$b = ($this->isHeadPart() ? $this : $other); $b = ($this->isHeadPart() ? $this : $other);
if($b->isOccupied()){ if($b->occupied){
$player->sendMessage(KnownTranslationFactory::tile_bed_occupied()->prefix(TextFormat::GRAY)); $player->sendMessage(KnownTranslationFactory::tile_bed_occupied()->prefix(TextFormat::GRAY));
return true; return true;

2
src/block/ChiseledBookshelf.php
View File

@ -97,7 +97,7 @@ class ChiseledBookshelf extends Opaque{
return false; return false;
} }
$x = Facing::axis($face) === Axis::X ? $clickVector->getZ() : $clickVector->getX(); $x = Facing::axis($face) === Axis::X ? $clickVector->z : $clickVector->x;
$slot = ChiseledBookshelfSlot::fromBlockFaceCoordinates( $slot = ChiseledBookshelfSlot::fromBlockFaceCoordinates(
Facing::isPositive(Facing::rotateY($face, true)) ? 1 - $x : $x, Facing::isPositive(Facing::rotateY($face, true)) ? 1 - $x : $x,
$clickVector->y $clickVector->y

4
src/block/ChorusFlower.php
View File

@ -54,7 +54,7 @@ final class ChorusFlower extends Flowable{
} }
private function canBeSupportedAt(Block $block) : bool{ private function canBeSupportedAt(Block $block) : bool{
$position = $block->getPosition(); $position = $block->position;
$world = $position->getWorld(); $world = $position->getWorld();
$down = $world->getBlock($position->down()); $down = $world->getBlock($position->down());
@ -152,7 +152,7 @@ final class ChorusFlower extends Flowable{
if($tx === null){ if($tx === null){
$tx = new BlockTransaction($this->position->getWorld()); $tx = new BlockTransaction($this->position->getWorld());
} }
$tx->addBlock($this->position->getSide($facing), (clone $this)->setAge(min(self::MAX_AGE, $this->getAge() + $ageChange))); $tx->addBlock($this->position->getSide($facing), (clone $this)->setAge(min(self::MAX_AGE, $this->age + $ageChange)));
return $tx; return $tx;
} }

2
src/block/ChorusPlant.php
View File

@ -51,7 +51,7 @@ final class ChorusPlant extends Flowable{
} }
private function canBeSupportedAt(Block $block) : bool{ private function canBeSupportedAt(Block $block) : bool{
$position = $block->getPosition(); $position = $block->position;
$world = $position->getWorld(); $world = $position->getWorld();
$down = $world->getBlock($position->down()); $down = $world->getBlock($position->down());

2
src/block/Farmland.php
View File

@ -152,7 +152,7 @@ class Farmland extends Transparent{
$ev = new EntityTrampleFarmlandEvent($entity, $this); $ev = new EntityTrampleFarmlandEvent($entity, $this);
$ev->call(); $ev->call();
if(!$ev->isCancelled()){ if(!$ev->isCancelled()){
$this->getPosition()->getWorld()->setBlock($this->getPosition(), VanillaBlocks::DIRT()); $this->position->getWorld()->setBlock($this->position, VanillaBlocks::DIRT());
} }
} }
return null; return null;

2
src/block/Fire.php
View File

@ -140,7 +140,7 @@ class Fire extends BaseFire{
$block->onIncinerate(); $block->onIncinerate();
$world = $this->position->getWorld(); $world = $this->position->getWorld();
if($world->getBlock($block->getPosition())->isSameState($block)){ if($world->getBlock($block->position)->isSameState($block)){
$spreadedFire = false; $spreadedFire = false;
if(mt_rand(0, $this->age + 9) < 5){ //TODO: check rain if(mt_rand(0, $this->age + 9) < 5){ //TODO: check rain
$fire = clone $this; $fire = clone $this;

2
src/block/FloorCoralFan.php
View File

@ -58,7 +58,7 @@ final class FloorCoralFan extends BaseCoral{
public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{ public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
if($player !== null){ if($player !== null){
$playerBlockPos = $player->getPosition()->floor(); $playerBlockPos = $player->getPosition()->floor();
$directionVector = $blockReplace->getPosition()->subtractVector($playerBlockPos)->normalize(); $directionVector = $blockReplace->position->subtractVector($playerBlockPos)->normalize();
$angle = rad2deg(atan2($directionVector->getZ(), $directionVector->getX())); $angle = rad2deg(atan2($directionVector->getZ(), $directionVector->getX()));
if($angle <= 45 || 315 <= $angle || (135 <= $angle && $angle <= 225)){ if($angle <= 45 || 315 <= $angle || (135 <= $angle && $angle <= 225)){

6
src/block/Jukebox.php
View File

@ -61,7 +61,7 @@ class Jukebox extends Opaque{
public function ejectRecord() : void{ public function ejectRecord() : void{
if($this->record !== null){ if($this->record !== null){
$this->getPosition()->getWorld()->dropItem($this->getPosition()->add(0.5, 1, 0.5), $this->record); $this->position->getWorld()->dropItem($this->position->add(0.5, 1, 0.5), $this->record);
$this->record = null; $this->record = null;
$this->stopSound(); $this->stopSound();
} }
@ -76,12 +76,12 @@ class Jukebox extends Opaque{
public function startSound() : void{ public function startSound() : void{
if($this->record !== null){ if($this->record !== null){
$this->getPosition()->getWorld()->addSound($this->getPosition(), new RecordSound($this->record->getRecordType())); $this->position->getWorld()->addSound($this->position, new RecordSound($this->record->getRecordType()));
} }
} }
public function stopSound() : void{ public function stopSound() : void{
$this->getPosition()->getWorld()->addSound($this->getPosition(), new RecordStopSound()); $this->position->getWorld()->addSound($this->position, new RecordStopSound());
} }
public function onBreak(Item $item, ?Player $player = null, array &$returnedItems = []) : bool{ public function onBreak(Item $item, ?Player $player = null, array &$returnedItems = []) : bool{

4
src/block/NetherVines.php
View File

@ -108,8 +108,8 @@ class NetherVines extends Flowable{
private function grow(?Player $player, int $growthAmount = 1) : bool{ private function grow(?Player $player, int $growthAmount = 1) : bool{
$top = $this->seekToTip(); $top = $this->seekToTip();
$age = $top->getAge(); $age = $top->age;
$pos = $top->getPosition(); $pos = $top->position;
$world = $pos->getWorld(); $world = $pos->getWorld();
$changedBlocks = 0; $changedBlocks = 0;

8
src/block/PinkPetals.php
View File

@ -70,13 +70,13 @@ class PinkPetals extends Flowable{
} }
public function canBePlacedAt(Block $blockReplace, Vector3 $clickVector, int $face, bool $isClickedBlock) : bool{ public function canBePlacedAt(Block $blockReplace, Vector3 $clickVector, int $face, bool $isClickedBlock) : bool{
return ($blockReplace instanceof PinkPetals && $blockReplace->getCount() < self::MAX_COUNT) || $this->supportedWhenPlacedAt($blockReplace, $clickVector, $face, $isClickedBlock); return ($blockReplace instanceof PinkPetals && $blockReplace->count < self::MAX_COUNT) || $this->supportedWhenPlacedAt($blockReplace, $clickVector, $face, $isClickedBlock);
} }
public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{ public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
if($blockReplace instanceof PinkPetals && $blockReplace->getCount() < self::MAX_COUNT){ if($blockReplace instanceof PinkPetals && $blockReplace->count < self::MAX_COUNT){
$this->count = $blockReplace->getCount() + 1; $this->count = $blockReplace->count + 1;
$this->facing = $blockReplace->getFacing(); $this->facing = $blockReplace->facing;
}elseif($player !== null){ }elseif($player !== null){
$this->facing = Facing::opposite($player->getHorizontalFacing()); $this->facing = Facing::opposite($player->getHorizontalFacing());
} }

2
src/block/RedMushroom.php
View File

@ -43,7 +43,7 @@ class RedMushroom extends Flowable{
public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{ public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
$down = $this->getSide(Facing::DOWN); $down = $this->getSide(Facing::DOWN);
$position = $this->getPosition(); $position = $this->position;
$lightLevel = $position->getWorld()->getFullLightAt($position->x, $position->y, $position->z); $lightLevel = $position->getWorld()->getFullLightAt($position->x, $position->y, $position->z);
$downId = $down->getTypeId(); $downId = $down->getTypeId();
//TODO: nylium support //TODO: nylium support

4
src/block/SmallDripleaf.php
View File

@ -83,7 +83,7 @@ class SmallDripleaf extends Transparent{
$this->facing = Facing::opposite($player->getHorizontalFacing()); $this->facing = Facing::opposite($player->getHorizontalFacing());
} }
$tx->addBlock($block->getPosition(), VanillaBlocks::SMALL_DRIPLEAF() $tx->addBlock($block->position, VanillaBlocks::SMALL_DRIPLEAF()
->setFacing($this->facing) ->setFacing($this->facing)
->setTop(true) ->setTop(true)
); );
@ -117,7 +117,7 @@ class SmallDripleaf extends Transparent{
$height = mt_rand(2, 5); $height = mt_rand(2, 5);
$grown = 0; $grown = 0;
for($i = 0; $i < $height; $i++){ for($i = 0; $i < $height; $i++){
$pos = $bottomBlock->getSide(Facing::UP, $i)->getPosition(); $pos = $bottomBlock->getSide(Facing::UP, $i)->position;
if(!$this->canGrowTo($pos)){ if(!$this->canGrowTo($pos)){
break; break;
} }

4
src/block/Stair.php
View File

@ -106,8 +106,8 @@ class Stair extends Transparent{
public function getSupportType(int $facing) : SupportType{ public function getSupportType(int $facing) : SupportType{
if( if(
$facing === Facing::UP && $this->isUpsideDown() || $facing === Facing::UP && $this->upsideDown ||
$facing === Facing::DOWN && !$this->isUpsideDown() || $facing === Facing::DOWN && !$this->upsideDown ||
($facing === $this->facing && $this->shape !== StairShape::OUTER_LEFT && $this->shape !== StairShape::OUTER_RIGHT) || ($facing === $this->facing && $this->shape !== StairShape::OUTER_LEFT && $this->shape !== StairShape::OUTER_RIGHT) ||
($facing === Facing::rotate($this->facing, Axis::Y, false) && $this->shape === StairShape::INNER_LEFT) || ($facing === Facing::rotate($this->facing, Axis::Y, false) && $this->shape === StairShape::INNER_LEFT) ||
($facing === Facing::rotate($this->facing, Axis::Y, true) && $this->shape === StairShape::INNER_RIGHT) ($facing === Facing::rotate($this->facing, Axis::Y, true) && $this->shape === StairShape::INNER_RIGHT)

8
src/block/inventory/AnimatedBlockInventoryTrait.php
View File

@ -47,20 +47,20 @@ trait AnimatedBlockInventoryTrait{
public function onOpen(Player $who) : void{ public function onOpen(Player $who) : void{
parent::onOpen($who); parent::onOpen($who);
if($this->getHolder()->isValid() && $this->getViewerCount() === 1){ if($this->holder->isValid() && $this->getViewerCount() === 1){
//TODO: this crap really shouldn't be managed by the inventory //TODO: this crap really shouldn't be managed by the inventory
$this->animateBlock(true); $this->animateBlock(true);
$this->getHolder()->getWorld()->addSound($this->getHolder()->add(0.5, 0.5, 0.5), $this->getOpenSound()); $this->holder->getWorld()->addSound($this->holder->add(0.5, 0.5, 0.5), $this->getOpenSound());
} }
} }
abstract protected function animateBlock(bool $isOpen) : void; abstract protected function animateBlock(bool $isOpen) : void;
public function onClose(Player $who) : void{ public function onClose(Player $who) : void{
if($this->getHolder()->isValid() && $this->getViewerCount() === 1){ if($this->holder->isValid() && $this->getViewerCount() === 1){
//TODO: this crap really shouldn't be managed by the inventory //TODO: this crap really shouldn't be managed by the inventory
$this->animateBlock(false); $this->animateBlock(false);
$this->getHolder()->getWorld()->addSound($this->getHolder()->add(0.5, 0.5, 0.5), $this->getCloseSound()); $this->holder->getWorld()->addSound($this->holder->add(0.5, 0.5, 0.5), $this->getCloseSound());
} }
parent::onClose($who); parent::onClose($who);
} }

2
src/block/tile/Chest.php
View File

@ -139,7 +139,7 @@ class Chest extends Spawnable implements Container, Nameable{
if($pair->doubleInventory !== null){ if($pair->doubleInventory !== null){
$this->doubleInventory = $pair->doubleInventory; $this->doubleInventory = $pair->doubleInventory;
}else{ }else{
if(($pair->getPosition()->x + ($pair->getPosition()->z << 15)) > ($this->position->x + ($this->position->z << 15))){ //Order them correctly if(($pair->position->x + ($pair->position->z << 15)) > ($this->position->x + ($this->position->z << 15))){ //Order them correctly
$this->doubleInventory = $pair->doubleInventory = new DoubleChestInventory($pair->inventory, $this->inventory); $this->doubleInventory = $pair->doubleInventory = new DoubleChestInventory($pair->inventory, $this->inventory);
}else{ }else{
$this->doubleInventory = $pair->doubleInventory = new DoubleChestInventory($this->inventory, $pair->inventory); $this->doubleInventory = $pair->doubleInventory = new DoubleChestInventory($this->inventory, $pair->inventory);