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

Fixed Item->equals() not working for no-NBT items since 9bb3c93285

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-10-29 12:45:39 +00:00
parent 3760307a88
commit 95be571481
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -785,10 +785,11 @@ class Item implements ItemIds, \JsonSerializable{
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->getDamage() === $item->getDamage())){ if($this->id === $item->getId() and (!$checkDamage or $this->getDamage() === $item->getDamage())){
if($checkCompound){ if($checkCompound){
if($this->hasNamedTag() and $item->hasNamedTag()){ if($this->hasNamedTag() and $item->hasNamedTag()){ //both items have NBT
//Serialized NBT didn't match, check the cached object tree.
return $this->getNamedTag()->equals($item->getNamedTag()); return $this->getNamedTag()->equals($item->getNamedTag());
} }
return (!$this->hasNamedTag() and !$item->hasNamedTag()); //both items must have no NBT
}else{ }else{
return true; return true;
} }