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

ItemTranslator: throw only the expected exception types

Browse Source
This commit is contained in:
Dylan K. Taylor 2022-06-06 22:09:32 +01:00
parent 860fa719b2
commit 57132204ec
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/network/mcpe/convert/ItemTranslator.php
View File

@ -25,6 +25,7 @@ namespace pocketmine\network\mcpe\convert;
use pocketmine\data\bedrock\item\ItemDeserializer; use pocketmine\data\bedrock\item\ItemDeserializer;
use pocketmine\data\bedrock\item\ItemSerializer; use pocketmine\data\bedrock\item\ItemSerializer;
use pocketmine\data\bedrock\item\ItemTypeDeserializeException;
use pocketmine\data\bedrock\item\ItemTypeSerializeException; use pocketmine\data\bedrock\item\ItemTypeSerializeException;
use pocketmine\data\bedrock\item\SavedItemData; use pocketmine\data\bedrock\item\SavedItemData;
use pocketmine\item\Item; use pocketmine\item\Item;
@ -98,12 +99,25 @@ final class ItemTranslator{
* @throws TypeConversionException * @throws TypeConversionException
*/ */
public function fromNetworkId(int $networkId, int $networkMeta, int $networkBlockRuntimeId) : Item{ public function fromNetworkId(int $networkId, int $networkMeta, int $networkBlockRuntimeId) : Item{
$stringId = $this->itemTypeDictionary->fromIntId($networkId); try{
$stringId = $this->itemTypeDictionary->fromIntId($networkId);
}catch(\InvalidArgumentException $e){
//TODO: a quiet version of fromIntId() would be better than catching InvalidArgumentException
throw TypeConversionException::wrap($e, "Invalid network itemstack ID $networkId");
}
$blockStateData = $networkBlockRuntimeId !== self::NO_BLOCK_RUNTIME_ID ? $blockStateData = null;
$this->blockStateDictionary->getDataFromStateId($networkBlockRuntimeId) : if($networkBlockRuntimeId !== self::NO_BLOCK_RUNTIME_ID){
null; $blockStateData = $this->blockStateDictionary->getDataFromStateId($networkBlockRuntimeId);
if($blockStateData === null){
throw new TypeConversionException("Blockstate runtimeID $networkBlockRuntimeId does not correspond to any known blockstate");
}
}
return $this->itemDeserializer->deserialize(new SavedItemData($stringId, $networkMeta, $blockStateData)); try{
return $this->itemDeserializer->deserialize(new SavedItemData($stringId, $networkMeta, $blockStateData));
}catch(ItemTypeDeserializeException $e){
throw TypeConversionException::wrap($e, "Invalid network itemstack data");
}
} }
} }