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

BaseWorldProvider: don't crash the server when encountering an unknown block

Browse Source
This commit is contained in:
Dylan K. Taylor
2022-07-21 16:12:27 +01:00
parent f6c9bf5cd1
commit bedf79e2cd
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/world/format/io/BaseWorldProvider.php
View File

@ -23,8 +23,7 @@ declare(strict_types=1);
namespace pocketmine\world\format\io;
use pocketmine\data\bedrock\block\BlockStateData;
use pocketmine\data\bedrock\block\BlockTypeNames;
use pocketmine\data\bedrock\block\BlockStateDeserializeException;
use pocketmine\world\format\io\exception\CorruptedWorldException;
use pocketmine\world\format\io\exception\UnsupportedWorldFormatException;
use pocketmine\world\format\PalettedBlockArray;
@ -62,10 +61,16 @@ abstract class BaseWorldProvider implements WorldProvider{
$newStateData = $blockDataUpgrader->upgradeIntIdMeta($legacyIdMeta >> 4, $legacyIdMeta & 0xf);
if($newStateData === null){
//TODO: remember data for unknown states so we can implement them later
$newStateData = new BlockStateData(BlockTypeNames::INFO_UPDATE, [], BlockStateData::CURRENT_VERSION);
$newStateData = GlobalBlockStateHandlers::getUnknownBlockStateData();
}
$newPalette[$k] = $blockStateDeserializer->deserialize($newStateData);
try{
$newPalette[$k] = $blockStateDeserializer->deserialize($newStateData);
}catch(BlockStateDeserializeException){
//TODO: this needs to be logged
//TODO: maybe we can remember unknown states for later saving instead of discarding them and destroying maps...
$newPalette[$k] = $blockStateDeserializer->deserialize(GlobalBlockStateHandlers::getUnknownBlockStateData());
}
}
//TODO: this is sub-optimal since it reallocates the offset table multiple times