From fb59b57bdfc4b1b04e079bf4e3d8ec48385a38e5 Mon Sep 17 00:00:00 2001
From: PMMPFTW <rayyanabm@gmail.com>
Date: Wed, 3 May 2017 11:13:00 +0100
Subject: [PATCH] Improve item enchantment API and fix some bugs (#512)

---
 src/pocketmine/item/Item.php | 93 ++++++++++++++++++++++++++----------
 1 file changed, 68 insertions(+), 25 deletions(-)

diff --git a/src/pocketmine/item/Item.php b/src/pocketmine/item/Item.php
index 58ae850f0..d74c881ed 100644
--- a/src/pocketmine/item/Item.php
+++ b/src/pocketmine/item/Item.php
@@ -504,10 +504,26 @@ class Item implements ItemIds, \JsonSerializable{
 		}
 
 		$tag = $this->getNamedTag();
-		if(isset($tag->ench)){
-			$tag = $tag->ench;
-			if($tag instanceof ListTag){
-				return true;
+
+		return isset($tag->ench) and $tag->ench instanceof ListTag;
+	}
+
+	/**
+	 * @param int $id
+	 * @param int $level
+	 *
+	 * @return bool
+	 */
+	public function hasEnchantment(int $id, int $level = -1) : bool{
+		if(!$this->hasEnchantments()){
+			return false;
+		}
+
+		foreach($this->getNamedTag()->ench as $entry){
+			if($entry["id"] === $id){
+				if($level === -1 or $entry["lvl"] === $level){
+					return true;
+				}
 			}
 		}
 
@@ -535,6 +551,35 @@ class Item implements ItemIds, \JsonSerializable{
 		return null;
 	}
 
+	/**
+	 * @param int $id
+	 * @param int $level
+	 */
+	public function removeEnchantment(int $id, int $level = -1){
+		if(!$this->hasEnchantments()){
+			return;
+		}
+
+		$tag = $this->getNamedTag();
+		foreach($tag->ench as $k => $entry){
+			if($entry["id"] === $id){
+				if($level === -1 or $entry["lvl"] === $level){
+					unset($tag->ench[$k]);
+					break;
+				}
+			}
+		}
+		$this->setNamedTag($tag);
+	}
+
+	public function removeEnchantments(){
+		if($this->hasEnchantments()){
+			$tag = $this->getNamedTag();
+			unset($tag->ench);
+			$this->setNamedTag($tag);
+		}
+	}
+
 	/**
 	 * @param Enchantment $ench
 	 */
@@ -545,26 +590,26 @@ class Item implements ItemIds, \JsonSerializable{
 			$tag = $this->getNamedTag();
 		}
 
+		$found = false;
+
 		if(!isset($tag->ench)){
 			$tag->ench = new ListTag("ench", []);
 			$tag->ench->setTagType(NBT::TAG_Compound);
-		}
-
-		$found = false;
-
-		foreach($tag->ench as $k => $entry){
-			if($entry["id"] === $ench->getId()){
-				$tag->ench->{$k} = new CompoundTag("", [
-					new ShortTag("id", $ench->getId()),
-					new ShortTag("lvl", $ench->getLevel())
-				]);
-				$found = true;
-				break;
+		}else{
+			foreach($tag->ench as $k => $entry){
+				if($entry["id"] === $ench->getId()){
+					$tag->ench->{$k} = new CompoundTag("", [
+						new ShortTag("id", $ench->getId()),
+						new ShortTag("lvl", $ench->getLevel())
+					]);
+					$found = true;
+					break;
+				}
 			}
 		}
 
 		if(!$found){
-			$tag->ench->{count($tag->ench) + 1} = new CompoundTag("", [
+			$tag->ench->{count($tag->ench)} = new CompoundTag("", [
 				new ShortTag("id", $ench->getId()),
 				new ShortTag("lvl", $ench->getLevel())
 			]);
@@ -577,16 +622,14 @@ class Item implements ItemIds, \JsonSerializable{
 	 * @return Enchantment[]
 	 */
 	public function getEnchantments() : array{
-		if(!$this->hasEnchantments()){
-			return [];
-		}
-
 		$enchantments = [];
 
-		foreach($this->getNamedTag()->ench as $entry){
-			$e = Enchantment::getEnchantment($entry["id"]);
-			$e->setLevel($entry["lvl"]);
-			$enchantments[] = $e;
+		if($this->hasEnchantments()){
+			foreach($this->getNamedTag()->ench as $entry){
+				$e = Enchantment::getEnchantment($entry["id"]);
+				$e->setLevel($entry["lvl"]);
+				$enchantments[] = $e;
+			}
 		}
 
 		return $enchantments;