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

Item: simplify equals()

Browse Source 
getNamedTag() can't return null anymore.
This commit is contained in:
Dylan K. Taylor
2019-07-16 18:11:09 +01:00
parent 49a6821195
commit ff21977461
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/pocketmine/item/Item.php
View File

@ -704,18 +704,9 @@ class Item implements ItemIds, \JsonSerializable{
* @return bool * @return bool
*/ */
final public function equals(Item $item, bool $checkDamage = true, bool $checkCompound = true) : bool{ final public function equals(Item $item, bool $checkDamage = true, bool $checkCompound = true) : bool{
if($this->id === $item->getId() and (!$checkDamage or $this->getMeta() === $item->getMeta())){ return $this->id === $item->getId() and
if($checkCompound){ (!$checkDamage or $this->getMeta() === $item->getMeta()) and
$tag1 = $this->getNamedTag(); (!$checkCompound or $this->getNamedTag()->equals($item->getNamedTag()));
$tag2 = $item->getNamedTag();
return ($tag1 === null and $tag2 === null) or ($tag1 !== null and $tag2 !== null and $tag1->equals($tag2));
}else{
return true;
}
}
return false;
} }
/** /**