From 77b3cd71a3cf7eddc46bfdfecb1d71f27223489a Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Wed, 21 Dec 2016 14:55:13 +0000
Subject: [PATCH] Fixed cannot use items with custom NBT in regular crafting
 recipe, close #135

---
 src/pocketmine/Player.php    | 2 +-
 src/pocketmine/item/Item.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 79dee8833..6f818867f 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -2729,7 +2729,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
 				foreach($ingredients as $ingredient){
 					$slot = -1;
 					foreach($this->inventory->getContents() as $index => $item){
-						if($ingredient->getId() !== 0 and $ingredient->deepEquals($item, !$ingredient->hasAnyDamageValue()) and ($item->getCount() - $used[$index]) >= 1){
+						if($ingredient->getId() !== 0 and $ingredient->equals($item, !$ingredient->hasAnyDamageValue(), $ingredient->hasCompoundTag()) and ($item->getCount() - $used[$index]) >= 1){
 							$slot = $index;
 							$used[$index]++;
 							break;
diff --git a/src/pocketmine/item/Item.php b/src/pocketmine/item/Item.php
index 8a4c8cf62..2c326e3da 100644
--- a/src/pocketmine/item/Item.php
+++ b/src/pocketmine/item/Item.php
@@ -337,7 +337,7 @@ class Item implements ItemIds, \JsonSerializable{
 		}
 	}
 
-	public function __construct(int $id, $meta = 0, int $count = 1, string $name = "Unknown"){
+	public function __construct(int $id, int $meta = 0, int $count = 1, string $name = "Unknown"){
 		$this->id = $id & 0xffff;
 		$this->meta = $meta !== -1 ? $meta & 0xffff : -1;
 		$this->count = $count;