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

Item IDs should always be unsigned, treat them with appropriate measures (fixes #1376)

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-10-03 12:28:50 +01:00
parent 88807e8b22
commit f7ee78233b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -982,7 +982,7 @@ class Item implements ItemIds, \JsonSerializable{
*/ */
public function nbtSerialize(int $slot = -1, string $tagName = "") : CompoundTag{ public function nbtSerialize(int $slot = -1, string $tagName = "") : CompoundTag{
$tag = new CompoundTag($tagName, [ $tag = new CompoundTag($tagName, [
new ShortTag("id", $this->id), new ShortTag("id", Binary::signShort($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),
]); ]);
@ -1015,7 +1015,7 @@ class Item implements ItemIds, \JsonSerializable{
$meta = isset($tag->Damage) ? $tag->Damage->getValue() : 0; $meta = isset($tag->Damage) ? $tag->Damage->getValue() : 0;
if($tag->id instanceof ShortTag){ if($tag->id instanceof ShortTag){
$item = ItemFactory::get($tag->id->getValue(), $meta, $count); $item = ItemFactory::get(Binary::unsignShort($tag->id->getValue()), $meta, $count);
}elseif($tag->id instanceof StringTag){ //PC item save format }elseif($tag->id instanceof StringTag){ //PC item save format
$item = ItemFactory::fromString($tag->id->getValue()); $item = ItemFactory::fromString($tag->id->getValue());
$item->setDamage($meta); $item->setDamage($meta);