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

Merge branch '3.5' into 3.6

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-02-08 15:32:20 +00:00
commit 30b49e0d22
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -318,7 +318,7 @@ class ItemFactory{
$listed = self::$list[self::getListOffset($id)]; $listed = self::$list[self::getListOffset($id)];
if($listed !== null){ if($listed !== null){
$item = clone $listed; $item = clone $listed;
}elseif($id < 256){ //intentionally includes negatives, for extended block IDs }elseif($id >= 0 and $id < 256){ //intentionally excludes negatives because extended blocks aren't supported yet
/* 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);

2
src/pocketmine/resources/vanilla

@ -1 +1 @@
Subproject commit 0c00c4f3b9de1b6b0866cab79a66a91182ae5405 Subproject commit b9247957dad663760f22842836844cfcd4b0c03e