From fd27227cc75790d9acb4dfb5345dd6689026013d Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Sat, 18 Jan 2020 20:10:46 +0000
Subject: [PATCH 1/2] Item: fix @return annotations for fluent methods (needed
 for correct auto complete)

---
 src/pocketmine/item/Item.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pocketmine/item/Item.php b/src/pocketmine/item/Item.php
index 664e07bba..4fe6bc67d 100644
--- a/src/pocketmine/item/Item.php
+++ b/src/pocketmine/item/Item.php
@@ -233,7 +233,7 @@ class Item implements ItemIds, \JsonSerializable{
 	 *
 	 * @param CompoundTag|string|null $tags
 	 *
-	 * @return Item
+	 * @return $this
 	 */
 	public function setCompoundTag($tags) : Item{
 		if($tags instanceof CompoundTag){
@@ -280,7 +280,7 @@ class Item implements ItemIds, \JsonSerializable{
 	/**
 	 * @param CompoundTag $compound
 	 *
-	 * @return Item
+	 * @return $this
 	 */
 	public function setCustomBlockData(CompoundTag $compound) : Item{
 		$tags = clone $compound;
@@ -479,7 +479,7 @@ class Item implements ItemIds, \JsonSerializable{
 	/**
 	 * @param string $name
 	 *
-	 * @return Item
+	 * @return $this
 	 */
 	public function setCustomName(string $name) : Item{
 		if($name === ""){
@@ -499,7 +499,7 @@ class Item implements ItemIds, \JsonSerializable{
 	}
 
 	/**
-	 * @return Item
+	 * @return $this
 	 */
 	public function clearCustomName() : Item{
 		$display = $this->getNamedTagEntry(self::TAG_DISPLAY);
@@ -531,7 +531,7 @@ class Item implements ItemIds, \JsonSerializable{
 	/**
 	 * @param string[] $lines
 	 *
-	 * @return Item
+	 * @return $this
 	 */
 	public function setLore(array $lines) : Item{
 		$display = $this->getNamedTagEntry(self::TAG_DISPLAY);
@@ -588,7 +588,7 @@ class Item implements ItemIds, \JsonSerializable{
 	 *
 	 * @param CompoundTag $tag
 	 *
-	 * @return Item
+	 * @return $this
 	 */
 	public function setNamedTag(CompoundTag $tag) : Item{
 		if($tag->getCount() === 0){
@@ -603,7 +603,7 @@ class Item implements ItemIds, \JsonSerializable{
 
 	/**
 	 * Removes the Item's NBT.
-	 * @return Item
+	 * @return $this
 	 */
 	public function clearNamedTag() : Item{
 		return $this->setCompoundTag("");
@@ -619,7 +619,7 @@ class Item implements ItemIds, \JsonSerializable{
 	/**
 	 * @param int $count
 	 *
-	 * @return Item
+	 * @return $this
 	 */
 	public function setCount(int $count) : Item{
 		$this->count = $count;
@@ -632,7 +632,7 @@ class Item implements ItemIds, \JsonSerializable{
 	 *
 	 * @param int $count
 	 *
-	 * @return Item
+	 * @return $this
 	 * @throws \InvalidArgumentException if trying to pop more items than are on the stack
 	 */
 	public function pop(int $count = 1) : Item{
@@ -700,7 +700,7 @@ class Item implements ItemIds, \JsonSerializable{
 	/**
 	 * @param int $meta
 	 *
-	 * @return Item
+	 * @return $this
 	 */
 	public function setDamage(int $meta) : Item{
 		$this->meta = $meta !== -1 ? $meta & 0x7FFF : -1;

From e544bc0d4ba5bbcde27da43e8eb6da122d0728d9 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Sat, 18 Jan 2020 20:11:47 +0000
Subject: [PATCH 2/2] Item: added missing return type info for
 clearCustomBlockData()

---
 src/pocketmine/item/Item.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pocketmine/item/Item.php b/src/pocketmine/item/Item.php
index 4fe6bc67d..d1e21183a 100644
--- a/src/pocketmine/item/Item.php
+++ b/src/pocketmine/item/Item.php
@@ -272,6 +272,9 @@ class Item implements ItemIds, \JsonSerializable{
 		return $this->getNamedTagEntry(self::TAG_BLOCK_ENTITY_TAG) instanceof CompoundTag;
 	}
 
+	/**
+	 * @return $this
+	 */
 	public function clearCustomBlockData(){
 		$this->removeNamedTagEntry(self::TAG_BLOCK_ENTITY_TAG);
 		return $this;