mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-16 08:25:29 +00:00
Code Issues Projects Releases Wiki Activity

Item: allow negative IDs

Browse Source 
this will be needed in the future for extended blocks support.
This commit is contained in:
Dylan K. Taylor 2018-07-16 12:46:16 +01:00
parent 7efe767f1f
commit 16c253d7a9
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pocketmine/item/Item.php
View File

@ -196,7 +196,10 @@ class Item implements ItemIds, \JsonSerializable{
* @param string $name * @param string $name
*/ */
public function __construct(int $id, int $meta = 0, string $name = "Unknown"){ public function __construct(int $id, int $meta = 0, string $name = "Unknown"){
$this->id = $id & 0xffff; if($id < -0x8000 or $id > 0x7fff){ //signed short range
throw new \InvalidArgumentException("ID must be in range " . -0x8000 . " - " . 0x7fff);
}
$this->id = $id;
$this->setDamage($meta); $this->setDamage($meta);
$this->name = $name; $this->name = $name;
} }
@ -916,7 +919,7 @@ class Item implements ItemIds, \JsonSerializable{
*/ */
public function nbtSerialize(int $slot = -1, string $tagName = "") : CompoundTag{ public function nbtSerialize(int $slot = -1, string $tagName = "") : CompoundTag{
$result = new CompoundTag($tagName, [ $result = new CompoundTag($tagName, [
new ShortTag("id", Binary::signShort($this->id)), new ShortTag("id", $this->id),
new ByteTag("Count", Binary::signByte($this->count)), new ByteTag("Count", Binary::signByte($this->count)),
new ShortTag("Damage", $this->meta) new ShortTag("Damage", $this->meta)
]); ]);
@ -951,7 +954,7 @@ class Item implements ItemIds, \JsonSerializable{
$idTag = $tag->getTag("id"); $idTag = $tag->getTag("id");
if($idTag instanceof ShortTag){ if($idTag instanceof ShortTag){
$item = ItemFactory::get(Binary::unsignShort($idTag->getValue()), $meta, $count); $item = ItemFactory::get($idTag->getValue(), $meta, $count);
}elseif($idTag instanceof StringTag){ //PC item save format }elseif($idTag instanceof StringTag){ //PC item save format
$item = ItemFactory::fromString($idTag->getValue()); $item = ItemFactory::fromString($idTag->getValue());
$item->setDamage($meta); $item->setDamage($meta);