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

Merge branch 'master' into mcpe-1.0

Browse Source
This commit is contained in:
Dylan K. Taylor
2016-12-29 11:36:14 +00:00
parent b082bec150 efc6d429f6
commit 850afed2c6
9 changed files with 219 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,6 +212,9 @@ class Item implements ItemIds, \JsonSerializable{
self::$list[self::BEETROOT] = Beetroot::class;
self::$list[self::BEETROOT_SEEDS] = BeetrootSeeds::class;
self::$list[self::BEETROOT_SOUP] = BeetrootSoup::class;
self::$list[self::PRISMARINE_CRYSTALS] = PrismarineCrystals::class;
self::$list[self::PRISMARINE_SHARD] = PrismarineShard::class;
self::$list[self::NETHER_STAR] = NetherStar::class;
for($i = 0; $i < 256; ++$i){
if(Block::$list[$i] !== null){
@ -799,7 +802,7 @@ class Item implements ItemIds, \JsonSerializable{
$tag->tag = clone $this->getNamedTag();
$tag->tag->setName("tag");
}
if($slot !== -1){
$tag->Slot = new ByteTag("Slot", $slot);
}