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

BlockFactory: change fullList to non-fixed array

Browse Source 
when we expand the metadata range, having a fixed array here will present some problems due to significantly increased memory footprint (2x for every bit added).
This commit is contained in:
Dylan K. Taylor 2022-03-23 14:34:15 +00:00
parent ed95679953
commit 310104f786
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/block/BlockFactory.php
View File

@ -71,10 +71,10 @@ class BlockFactory{
use SingletonTrait; use SingletonTrait;
/** /**
* @var \SplFixedArray|Block[] * @var Block[]
* @phpstan-var \SplFixedArray<Block> * @phpstan-var array<int, Block>
*/ */
private $fullList; private array $fullList = [];
/** /**
* @var int[] * @var int[]
@ -110,8 +110,6 @@ class BlockFactory{
public $blastResistance; public $blastResistance;
public function __construct(){ public function __construct(){
$this->fullList = new \SplFixedArray(1024 << Block::INTERNAL_METADATA_BITS);
$this->light = \SplFixedArray::fromArray(array_fill(0, 1024 << Block::INTERNAL_METADATA_BITS, 0)); $this->light = \SplFixedArray::fromArray(array_fill(0, 1024 << Block::INTERNAL_METADATA_BITS, 0));
$this->lightFilter = \SplFixedArray::fromArray(array_fill(0, 1024 << Block::INTERNAL_METADATA_BITS, 1)); $this->lightFilter = \SplFixedArray::fromArray(array_fill(0, 1024 << Block::INTERNAL_METADATA_BITS, 1));
$this->blocksDirectSkyLight = \SplFixedArray::fromArray(array_fill(0, 1024 << Block::INTERNAL_METADATA_BITS, false)); $this->blocksDirectSkyLight = \SplFixedArray::fromArray(array_fill(0, 1024 << Block::INTERNAL_METADATA_BITS, false));
@ -1017,7 +1015,7 @@ class BlockFactory{
public function remap(int $id, int $meta, Block $block) : void{ public function remap(int $id, int $meta, Block $block) : void{
$index = ($id << Block::INTERNAL_METADATA_BITS) | $meta; $index = ($id << Block::INTERNAL_METADATA_BITS) | $meta;
if($this->isRegistered($id, $meta)){ if($this->isRegistered($id, $meta)){
$existing = $this->fullList[$index]; $existing = $this->fullList[$index] ?? null;
if($existing !== null && $existing->getFullId() === $index){ if($existing !== null && $existing->getFullId() === $index){
throw new \InvalidArgumentException("$id:$meta is already mapped"); throw new \InvalidArgumentException("$id:$meta is already mapped");
}else{ }else{
@ -1053,12 +1051,12 @@ class BlockFactory{
} }
$index = ($id << Block::INTERNAL_METADATA_BITS) | $meta; $index = ($id << Block::INTERNAL_METADATA_BITS) | $meta;
if($index < 0 || $index >= $this->fullList->getSize()){ if($index < 0){
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){ //hot if(isset($this->fullList[$index])){ //hot
$block = clone $this->fullList[$index]; $block = clone $this->fullList[$index];
}elseif(($mappedIndex = $this->getMappedStateId($index)) !== $index && $this->fullList[$mappedIndex] !== null){ //cold }elseif(($mappedIndex = $this->getMappedStateId($index)) !== $index && isset($this->fullList[$mappedIndex])){ //cold
$block = clone $this->fullList[$mappedIndex]; $block = clone $this->fullList[$mappedIndex];
}else{ }else{
$block = new UnknownBlock(new BID($id, $meta), BlockBreakInfo::instant()); $block = new UnknownBlock(new BID($id, $meta), BlockBreakInfo::instant());
@ -1076,13 +1074,13 @@ class BlockFactory{
*/ */
public function isRegistered(int $id, int $meta = 0) : bool{ public function isRegistered(int $id, int $meta = 0) : bool{
$index = ($id << Block::INTERNAL_METADATA_BITS) | $meta; $index = ($id << Block::INTERNAL_METADATA_BITS) | $meta;
$b = $this->fullList[$index]; $b = $this->fullList[$index] ?? null;
if($b === null){ if($b === null){
$mappedIndex = $this->mappedStateIndexes[$index] ?? $this->defaultStateIndexes[$id] ?? null; $mappedIndex = $this->mappedStateIndexes[$index] ?? $this->defaultStateIndexes[$id] ?? null;
if($mappedIndex === null){ if($mappedIndex === null){
return false; return false;
} }
$b = $this->fullList[$mappedIndex]; $b = $this->fullList[$mappedIndex] ?? null;
} }
return $b !== null && !($b instanceof UnknownBlock); return $b !== null && !($b instanceof UnknownBlock);
} }
@ -1091,7 +1089,7 @@ class BlockFactory{
* @return Block[] * @return Block[]
*/ */
public function getAllKnownStates() : array{ public function getAllKnownStates() : array{
return array_filter($this->fullList->toArray(), function(?Block $v) : bool{ return $v !== null; }); return $this->fullList;
} }
/** /**
@ -1099,7 +1097,7 @@ class BlockFactory{
* Used to correct invalid blockstates found in loaded chunks. * Used to correct invalid blockstates found in loaded chunks.
*/ */
public function getMappedStateId(int $fullState) : int{ public function getMappedStateId(int $fullState) : int{
if($this->fullList[$fullState] !== null){ if(isset($this->fullList[$fullState])){
return $fullState; return $fullState;
} }
return $this->mappedStateIndexes[$fullState] ?? $this->defaultStateIndexes[$fullState >> Block::INTERNAL_METADATA_BITS] ?? $fullState; return $this->mappedStateIndexes[$fullState] ?? $this->defaultStateIndexes[$fullState >> Block::INTERNAL_METADATA_BITS] ?? $fullState;