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

ItemFactory: Throw exception on failure to parse string as an item in fromString()

Browse Source 
closes #1487
This commit is contained in:
Dylan K. Taylor 2018-02-15 17:56:55 +00:00
parent af2435f199
commit 4c583ec8ab
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pocketmine/item/ItemFactory.php
View File

@ -332,6 +332,8 @@ class ItemFactory{
* @param bool $multiple * @param bool $multiple
* *
* @return Item[]|Item * @return Item[]|Item
*
* @throws \InvalidArgumentException if the given string cannot be parsed as an item identifier
*/ */
public static function fromString(string $str, bool $multiple = false){ public static function fromString(string $str, bool $multiple = false){
if($multiple === true){ if($multiple === true){
@ -349,12 +351,12 @@ class ItemFactory{
$meta = $b[1] & 0xFFFF; $meta = $b[1] & 0xFFFF;
} }
if(defined(ItemIds::class . "::" . strtoupper($b[0]))){ if(is_numeric($b[0])){
$item = self::get(constant(ItemIds::class . "::" . strtoupper($b[0])), $meta);
}elseif(is_numeric($b[0])){
$item = self::get(((int) $b[0]) & 0xFFFF, $meta); $item = self::get(((int) $b[0]) & 0xFFFF, $meta);
}elseif(defined(ItemIds::class . "::" . strtoupper($b[0]))){
$item = self::get(constant(ItemIds::class . "::" . strtoupper($b[0])), $meta);
}else{ }else{
$item = self::get(Item::AIR, 0, 0); throw new \InvalidArgumentException("Unable to resolve \"" . $str . "\" to a valid item");
} }
return $item; return $item;