mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 17:59:48 +00:00
Code Issues Projects Releases Wiki Activity

ItemDeserializer: throw a more specific exception on unknown items

Browse Source
This commit is contained in:
Dylan K. Taylor
2022-07-14 19:16:15 +01:00
parent eb8fb63409
commit b4ce5ed515
3 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/data/bedrock/item/ItemDeserializer.php
View File

@ -30,6 +30,7 @@ use pocketmine\block\utils\TreeType;
use pocketmine\block\VanillaBlocks as Blocks;
use pocketmine\data\bedrock\block\BlockStateDeserializeException;
use pocketmine\data\bedrock\block\BlockStateDeserializer;
use pocketmine\data\bedrock\block\convert\UnsupportedBlockStateException;
use pocketmine\data\bedrock\CompoundTypeIds;
use pocketmine\data\bedrock\DyeColorIdMap;
use pocketmine\data\bedrock\EntityLegacyIds;
@ -71,6 +72,8 @@ final class ItemDeserializer{
//TODO: this is rough duct tape; we need a better way to deal with this
try{
$block = $this->blockStateDeserializer->deserialize($blockData);
}catch(UnsupportedBlockStateException $e){
throw new UnsupportedItemTypeException($e->getMessage(), 0, $e);
}catch(BlockStateDeserializeException $e){
throw new ItemTypeDeserializeException("Failed to deserialize item data: " . $e->getMessage(), 0, $e);
}
@ -80,7 +83,7 @@ final class ItemDeserializer{
}
$id = $data->getName();
if(!isset($this->deserializers[$id])){
throw new ItemTypeDeserializeException("No deserializer found for ID $id");
throw new UnsupportedItemTypeException("No deserializer found for ID $id");
}
return ($this->deserializers[$id])($data);