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

Merge branch 'master' into mcpe-1.2

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-09-09 21:58:30 +01:00
parent 10b765e17a 3b9689674d
commit 16cb75ef38
8 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -338,11 +338,13 @@ class ItemFactory{
if(defined(Item::class . "::" . strtoupper($b[0]))){
$item = self::get(constant(Item::class . "::" . strtoupper($b[0])), $meta);
if($item->getId() === Item::AIR and strtoupper($b[0]) !== "AIR"){
$item = self::get($b[0] & 0xFFFF, $meta);
if($item->getId() === Item::AIR and strtoupper($b[0]) !== "AIR" and is_numeric($b[0])){
$item = self::get(((int) $b[0]) & 0xFFFF, $meta);
}
}elseif(is_numeric($b[0])){
$item = self::get(((int) $b[0]) & 0xFFFF, $meta);
}else{
$item = self::get($b[0] & 0xFFFF, $meta);
$item = self::get(Item::AIR, 0, 0);
}
return $item;