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

BlockFactory: simplify get() code

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-08-21 15:41:00 +01:00
parent 4023a024ce
commit 686bf398d5
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/block/BlockFactory.php
View File

@ -957,18 +957,13 @@ class BlockFactory{
throw new \InvalidArgumentException("Block meta value $meta is out of bounds"); throw new \InvalidArgumentException("Block meta value $meta is out of bounds");
} }
/** @var Block|null $block */ $index = ($id << Block::INTERNAL_METADATA_BITS) | $meta;
$block = null; if($index < 0 || $index >= $this->fullList->getSize()){
try{
$index = ($id << Block::INTERNAL_METADATA_BITS) | $meta;
if($this->fullList[$index] !== null){
$block = clone $this->fullList[$index];
}
}catch(\RuntimeException $e){
throw new \InvalidArgumentException("Block ID $id is out of bounds"); throw new \InvalidArgumentException("Block ID $id is out of bounds");
} }
if($this->fullList[$index] !== null){
if($block === null){ $block = clone $this->fullList[$index];
}else{
$block = new UnknownBlock(new BID($id, $meta), BlockBreakInfo::instant()); $block = new UnknownBlock(new BID($id, $meta), BlockBreakInfo::instant());
} }