mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-13 09:19:42 +00:00
Code Issues Projects Releases Wiki Activity

ItemFactory: fix special case handling for durable items, close #2483

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-10-17 15:02:52 +01:00
parent 9284e53f9e
commit f81849e550
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -347,8 +347,16 @@ class ItemFactory{
$sublist = self::$list[self::getListOffset($id)]; $sublist = self::$list[self::getListOffset($id)];
/** @var Item|null $listed */ /** @var Item|null $listed */
if($sublist !== null and isset($sublist[$meta])){ if($sublist !== null){
if(isset($sublist[$meta])){
$item = clone $sublist[$meta]; $item = clone $sublist[$meta];
}elseif(isset($sublist[0]) and $sublist[0] instanceof Durable){
/** @var Durable $item */
$item = clone $sublist[0];
$item->setDamage($meta);
}else{
throw new \InvalidArgumentException("Unknown variant $meta of item ID $id");
}
}elseif($id < 256){ //intentionally includes negatives, for extended block IDs }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 /* 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. */ * crafting ingredients with any-damage. */
@ -363,9 +371,6 @@ class ItemFactory{
$item->setCount($count); $item->setCount($count);
$item->setCompoundTag($tags); $item->setCompoundTag($tags);
if($item instanceof Durable){ //nasty, but necessary for BC reasons
$item->setDamage($meta);
}
return $item; return $item;
} }