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

ItemBlock no longer depends on legacy ID/metadata

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-10-04 18:27:20 +01:00
parent 7ef794d725
commit c42a6d7552
2 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/item/ItemBlock.php
View File

@ -31,25 +31,15 @@ use pocketmine\block\BlockFactory;
*/
class ItemBlock extends Item{
/** @var int */
protected $blockId;
/** @var int */
protected $blockMeta;
private $blockFullId;
/**
* @param int $blockMeta usually 0-15 (placed blocks may only have meta values 0-15)
*/
public function __construct(int $blockId, int $blockMeta, ItemIdentifier $identifier){
if($blockMeta < 0 || $blockMeta > 15){
throw new \InvalidArgumentException("Block meta value may only be between 0 and 15");
}
$this->blockId = $blockId;
$this->blockMeta = $blockMeta;
parent::__construct($identifier, $this->getBlock()->getName());
public function __construct(ItemIdentifier $identifier, Block $block){
parent::__construct($identifier, $block->getName());
$this->blockFullId = $block->getFullId();
}
public function getBlock(?int $clickedFace = null) : Block{
return BlockFactory::getInstance()->get($this->blockId, $this->blockMeta);
return BlockFactory::getInstance()->fromFullBlock($this->blockFullId);
}
public function getFuelTime() : int{