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

Painting: use motive directly internally

Browse Source 
this is cleaner and also fixes a phpstan level 8 error
This commit is contained in:
Dylan K. Taylor 2020-06-27 12:12:09 +01:00
parent 3c1b8b83f5
commit b7b5ea6fc9
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/entity/object/Painting.php
View File

@ -70,11 +70,11 @@ class Painting extends Entity{
protected $blockIn;
/** @var int */
protected $facing = Facing::NORTH;
/** @var string */
/** @var PaintingMotive */
protected $motive;
public function __construct(Location $location, Vector3 $blockIn, int $facing, PaintingMotive $motive, ?CompoundTag $nbt = null){
$this->motive = $motive->getName(); //TODO: use motive directly
$this->motive = $motive;
$this->blockIn = $blockIn->asVector3();
$this->facing = $facing;
parent::__construct($location, $nbt);
@ -95,7 +95,7 @@ class Painting extends Entity{
$nbt->setByte("Facing", self::FACING_TO_DATA[$this->facing]);
$nbt->setByte("Direction", self::FACING_TO_DATA[$this->facing]); //Save both for full compatibility
$nbt->setString("Motive", $this->motive);
$nbt->setString("Motive", $this->motive->getName());
return $nbt;
}
@ -153,7 +153,7 @@ class Painting extends Entity{
($this->boundingBox->minZ + $this->boundingBox->maxZ) / 2
);
$pk->direction = self::FACING_TO_DATA[$this->facing];
$pk->title = $this->motive;
$pk->title = $this->motive->getName();
$player->getNetworkSession()->sendDataPacket($pk);
}
@ -162,7 +162,7 @@ class Painting extends Entity{
* Returns the painting motive (which image is displayed on the painting)
*/
public function getMotive() : PaintingMotive{
return PaintingMotive::getMotiveByName($this->motive);
return $this->motive;
}
public function getFacing() : int{

5
tests/phpstan/configs/l8-baseline.neon
View File

@ -145,11 +145,6 @@ parameters:
count: 1
path: ../../../src/entity/Living.php
-
message: "#^Method pocketmine\\\\entity\\\\object\\\\Painting\\:\\:getMotive\\(\\) should return pocketmine\\\\entity\\\\object\\\\PaintingMotive but returns pocketmine\\\\entity\\\\object\\\\PaintingMotive\\|null\\.$#"
count: 1
path: ../../../src/entity/object/Painting.php
-
message: "#^Cannot call method getEffectLevel\\(\\) on pocketmine\\\\entity\\\\effect\\\\EffectInstance\\|null\\.$#"
count: 2