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

Remove BlockFactory::get(), optimise fromFullBlock() pathway

Browse Source
This commit is contained in:
Dylan K. Taylor 2022-07-05 13:43:26 +01:00
parent bd773c2f84
commit a059d03b37
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/block/BlockFactory.php
View File

@ -854,30 +854,6 @@ class BlockFactory{
} }
} }
/**
* @internal
* @see VanillaBlocks
*
* Deserializes a block from the provided type ID and internal state data.
*/
public function get(int $typeId, int $stateData) : Block{
if($stateData < 0 || $stateData >= (1 << Block::INTERNAL_STATE_DATA_BITS)){
throw new \InvalidArgumentException("Block meta value $stateData is out of bounds");
}
$index = ($typeId << Block::INTERNAL_STATE_DATA_BITS) | $stateData;
if($index < 0){
throw new \InvalidArgumentException("Block ID $typeId is out of bounds");
}
if(isset($this->fullList[$index])) { //hot
$block = clone $this->fullList[$index];
}else{
$block = new UnknownBlock(new BID($typeId), BreakInfo::instant(), $stateData);
}
return $block;
}
/** /**
* @internal * @internal
* Returns the default state of the block type associated with the given type ID. * Returns the default state of the block type associated with the given type ID.
@ -891,7 +867,18 @@ class BlockFactory{
} }
public function fromFullBlock(int $fullState) : Block{ public function fromFullBlock(int $fullState) : Block{
return $this->get($fullState >> Block::INTERNAL_STATE_DATA_BITS, $fullState & Block::INTERNAL_STATE_DATA_MASK); if($fullState < 0){
throw new \InvalidArgumentException("Block state ID cannot be negative");
}
if(isset($this->fullList[$fullState])) { //hot
$block = clone $this->fullList[$fullState];
}else{
$typeId = $fullState >> Block::INTERNAL_STATE_DATA_BITS;
$stateData = $fullState & Block::INTERNAL_STATE_DATA_MASK;
$block = new UnknownBlock(new BID($typeId), BreakInfo::instant(), $stateData);
}
return $block;
} }
/** /**