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

ItemFactory: prepare for handling items with negative IDs

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-07-16 13:24:12 +01:00
parent 16c253d7a9
commit 71c3c34976
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -281,7 +281,7 @@ class ItemFactory{
throw new \RuntimeException("Trying to overwrite an already registered item"); throw new \RuntimeException("Trying to overwrite an already registered item");
} }
self::$list[$id] = clone $item; self::$list[self::getListOffset($id)] = clone $item;
} }
/** /**
@ -302,10 +302,10 @@ class ItemFactory{
try{ try{
/** @var Item|null $listed */ /** @var Item|null $listed */
$listed = self::$list[$id]; $listed = self::$list[self::getListOffset($id)];
if($listed !== null){ if($listed !== null){
$item = clone $listed; $item = clone $listed;
}elseif($id < 256){ }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. */
$item = new ItemBlock($id, $meta); $item = new ItemBlock($id, $meta);
@ -353,13 +353,13 @@ class ItemFactory{
if(!isset($b[1])){ if(!isset($b[1])){
$meta = 0; $meta = 0;
}elseif(is_numeric($b[1])){ }elseif(is_numeric($b[1])){
$meta = $b[1] & 0xFFFF; $meta = $b[1];
}else{ }else{
throw new \InvalidArgumentException("Unable to parse \"" . $b[1] . "\" from \"" . $str . "\" as a valid meta value"); throw new \InvalidArgumentException("Unable to parse \"" . $b[1] . "\" from \"" . $str . "\" as a valid meta value");
} }
if(is_numeric($b[0])){ if(is_numeric($b[0])){
$item = self::get(((int) $b[0]) & 0xFFFF, $meta); $item = self::get((int) $b[0], $meta);
}elseif(defined(ItemIds::class . "::" . strtoupper($b[0]))){ }elseif(defined(ItemIds::class . "::" . strtoupper($b[0]))){
$item = self::get(constant(ItemIds::class . "::" . strtoupper($b[0])), $meta); $item = self::get(constant(ItemIds::class . "::" . strtoupper($b[0])), $meta);
}else{ }else{
@ -380,6 +380,13 @@ class ItemFactory{
if($id < 256){ if($id < 256){
return BlockFactory::isRegistered($id); return BlockFactory::isRegistered($id);
} }
return self::$list[$id] !== null; return self::$list[self::getListOffset($id)] !== null;
}
private static function getListOffset(int $id) : int{
if($id < -0x8000 or $id > 0x7fff){
throw new \InvalidArgumentException("ID must be in range " . -0x8000 . " - " . 0x7fff);
}
return $id & 0xffff;
} }
} }