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

ItemFactory: clean up some unnecessary code

Browse Source 
this try/catch isn't needed because the list offset derivation function will deal with invalid IDs anyway.
This commit is contained in:
Dylan K. Taylor 2018-10-17 17:12:53 +01:00
parent e7494fff96
commit a2a6286e1c
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -346,25 +346,19 @@ class ItemFactory{
/** @var Item $item */ /** @var Item $item */
$item = null; $item = null;
if($meta !== -1){ if($meta !== -1){
try{ $sublist = self::$list[self::getListOffset($id)];
$sublist = self::$list[self::getListOffset($id)];
/** @var Item|null $listed */ /** @var Item|null $listed */
if($sublist !== null){ if($sublist !== null){
if(isset($sublist[$meta])){ if(isset($sublist[$meta])){
$item = clone $sublist[$meta]; $item = clone $sublist[$meta];
}elseif(isset($sublist[0]) and $sublist[0] instanceof Durable){ }elseif(isset($sublist[0]) and $sublist[0] instanceof Durable){
/** @var Durable $item */ /** @var Durable $item */
$item = clone $sublist[0]; $item = clone $sublist[0];
$item->setDamage($meta); $item->setDamage($meta);
}
}elseif($id < 256){ //intentionally includes negatives, for extended block IDs
/* Blocks must have a damage value 0-15, but items can have damage value -1 to indicate that they are
* crafting ingredients with any-damage. */
$item = new ItemBlock($id, $meta);
} }
}catch(\RuntimeException $e){ }elseif($id < 256){ //intentionally includes negatives, for extended block IDs
throw new \InvalidArgumentException("Item ID $id is invalid or out of bounds"); $item = new ItemBlock($id, $meta);
} }
} }