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

fix RuntimeBlockMapping

Browse Source
This commit is contained in:
Dylan K. Taylor 2022-02-07 02:46:50 +00:00
parent 9e03136861
commit f870568e62
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/network/mcpe/convert/RuntimeBlockMapping.php
View File

@ -28,6 +28,8 @@ use pocketmine\block\UnknownBlock;
use pocketmine\data\bedrock\blockstate\BlockStateData; use pocketmine\data\bedrock\blockstate\BlockStateData;
use pocketmine\data\bedrock\blockstate\BlockStateSerializeException; use pocketmine\data\bedrock\blockstate\BlockStateSerializeException;
use pocketmine\data\bedrock\blockstate\BlockTypeNames; use pocketmine\data\bedrock\blockstate\BlockTypeNames;
use pocketmine\data\bedrock\blockstate\CachingBlockStateSerializer;
use pocketmine\data\bedrock\blockstate\convert\BlockObjectToBlockStateSerializer;
use pocketmine\data\bedrock\blockstate\convert\BlockStateSerializer; use pocketmine\data\bedrock\blockstate\convert\BlockStateSerializer;
use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\CompoundTag;
use pocketmine\utils\AssumptionFailedError; use pocketmine\utils\AssumptionFailedError;
@ -56,7 +58,7 @@ final class RuntimeBlockMapping{
private function __construct(){ private function __construct(){
$contents = Utils::assumeNotFalse(file_get_contents(Path::join(\pocketmine\BEDROCK_DATA_PATH, "canonical_block_states.nbt")), "Missing required resource file"); $contents = Utils::assumeNotFalse(file_get_contents(Path::join(\pocketmine\BEDROCK_DATA_PATH, "canonical_block_states.nbt")), "Missing required resource file");
$this->blockStateDictionary = BlockStateDictionary::loadFromString($contents); $this->blockStateDictionary = BlockStateDictionary::loadFromString($contents);
$this->blockStateSerializer = new BlockStateSerializer(); $this->blockStateSerializer = new CachingBlockStateSerializer(new BlockObjectToBlockStateSerializer());
$this->fallbackStateData = new BlockStateData(BlockTypeNames::INFO_UPDATE, CompoundTag::create(), BlockStateData::CURRENT_VERSION); $this->fallbackStateData = new BlockStateData(BlockTypeNames::INFO_UPDATE, CompoundTag::create(), BlockStateData::CURRENT_VERSION);
} }
@ -66,16 +68,12 @@ final class RuntimeBlockMapping{
return $this->networkIdCache[$internalStateId]; return $this->networkIdCache[$internalStateId];
} }
//TODO: singleton usage not ideal
$block = BlockFactory::getInstance()->fromFullBlock($internalStateId);
if($block instanceof UnknownBlock){
$blockStateData = $this->fallbackStateData;
}else{
try{ try{
$blockStateData = $this->blockStateSerializer->serialize($block); $blockStateData = $this->blockStateSerializer->serialize($internalStateId);
}catch(BlockStateSerializeException $e){ }catch(BlockStateSerializeException){
throw new AssumptionFailedError("Invalid serializer for block $block", 0, $e); //TODO: this will swallow any error caused by invalid block properties; this is not ideal, but it should be
} //covered by unit tests, so this is probably a safe assumption.
$blockStateData = new BlockStateData(BlockTypeNames::INFO_UPDATE, CompoundTag::create(), BlockStateData::CURRENT_VERSION);
} }
$networkId = $this->blockStateDictionary->lookupStateIdFromData($blockStateData); $networkId = $this->blockStateDictionary->lookupStateIdFromData($blockStateData);