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

ItemFactory: Allow block-items to be overridden

Browse Source 
Currently an ItemBlock is created for every Block requested, but this will need to change in the future (for Anvils because they have stupid bitshifts on the meta instead of a nice bitmask). This allows registering items in the ItemFactory with IDs lower than 256 and having them recognized.
This commit is contained in:
Dylan K. Taylor 2018-02-16 11:02:37 +00:00
parent be1ddb9f5b
commit 2cabdca3f7
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,25 +292,22 @@ class ItemFactory{
throw new \TypeError("`tags` argument must be a string or CompoundTag instance, " . (is_object($tags) ? "instance of " . get_class($tags) : gettype($tags)) . " given");
}
$item = null;
try{
if($id < 256){
/** @var Item|null $listed */
$listed = self::$list[$id];
if($listed !== null){
$item = clone $listed;
}elseif($id < 256){
/* 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);
}else{
/** @var Item|null $listed */
$listed = self::$list[$id];
if($listed !== null){
$item = clone $listed;
}
$item = new Item($id, $meta);
}
}catch(\RuntimeException $e){
throw new \InvalidArgumentException("Item ID $id is invalid or out of bounds");
}
$item = ($item ?? new Item($id, $meta));
$item->setDamage($meta);
$item->setCount($count);
$item->setCompoundTag($tags);