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

Merge 'minor-next' into 'major-next'

Browse Source 
Automatic merge performed by: https://github.com/pmmp/RestrictedActions/actions/runs/13878654456
This commit is contained in:
pmmp-admin-bot[bot] 2025-03-16 01:41:31 +00:00
commit 510ef94698
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/block/RuntimeBlockStateRegistry.php
View File

@ -209,6 +209,10 @@ class RuntimeBlockStateRegistry{
return $block; return $block;
} }
public function hasStateId(int $stateId) : bool{
return isset($this->fullList[$stateId]);
}
/** /**
* @return Block[] * @return Block[]
* @phpstan-return array<int, Block> * @phpstan-return array<int, Block>

15
src/data/bedrock/block/convert/BlockStateToObjectDeserializer.php
View File

@ -33,6 +33,7 @@ use pocketmine\block\DoublePitcherCrop;
use pocketmine\block\Opaque; use pocketmine\block\Opaque;
use pocketmine\block\PinkPetals; use pocketmine\block\PinkPetals;
use pocketmine\block\PitcherCrop; use pocketmine\block\PitcherCrop;
use pocketmine\block\RuntimeBlockStateRegistry;
use pocketmine\block\Slab; use pocketmine\block\Slab;
use pocketmine\block\Stair; use pocketmine\block\Stair;
use pocketmine\block\SweetBerryBush; use pocketmine\block\SweetBerryBush;
@ -97,11 +98,21 @@ final class BlockStateToObjectDeserializer implements BlockStateDeserializer{
public function deserialize(BlockStateData $stateData) : int{ public function deserialize(BlockStateData $stateData) : int{
if(count($stateData->getStates()) === 0){ if(count($stateData->getStates()) === 0){
//if a block has zero properties, we can keep a map of string ID -> internal blockstate ID //if a block has zero properties, we can keep a map of string ID -> internal blockstate ID
return $this->simpleCache[$stateData->getName()] ??= $this->deserializeBlock($stateData)->getStateId(); return $this->simpleCache[$stateData->getName()] ??= $this->deserializeToStateId($stateData);
} }
//we can't cache blocks that have properties - go ahead and deserialize the slow way //we can't cache blocks that have properties - go ahead and deserialize the slow way
return $this->deserializeBlock($stateData)->getStateId(); return $this->deserializeToStateId($stateData);
}
private function deserializeToStateId(BlockStateData $stateData) : int{
$stateId = $this->deserializeBlock($stateData)->getStateId();
//plugin devs seem to keep missing this and causing core crashes, so we need to verify this at the earliest
//available opportunity
if(!RuntimeBlockStateRegistry::getInstance()->hasStateId($stateId)){
throw new \LogicException("State ID $stateId returned by deserializer for " . $stateData->getName() . " is not registered in RuntimeBlockStateRegistry");
}
return $stateId;
} }
/** @phpstan-param \Closure(Reader) : Block $c */ /** @phpstan-param \Closure(Reader) : Block $c */