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

Added compound tag checking for Item->equals()

Browse Source
This commit is contained in:
Shoghi Cervantes
2015-08-06 20:25:22 +02:00
parent a65109ff34
commit 091d0b3ff9
7 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -406,7 +406,7 @@ class Item{
protected $block;
protected $id;
protected $meta;
protected $nbt;
protected $nbt = "";
public $count;
protected $durability = 0;
protected $name;
@ -1048,7 +1048,7 @@ class Item{
}
final public function __toString(){
return "Item " . $this->name . " (" . $this->id . ":" . ($this->meta === null ? "?" : $this->meta) . ")x" . $this->count . ($this->hasCompoundTag() ? " userData:0x".bin2hex($this->getCompoundTag()) : "");
return "Item " . $this->name . " (" . $this->id . ":" . ($this->meta === null ? "?" : $this->meta) . ")x" . $this->count . ($this->hasCompoundTag() ? " tags:0x".bin2hex($this->getCompoundTag()) : "");
}
public function getDestroySpeed(Block $block, Player $player){
@ -1059,8 +1059,8 @@ class Item{
return false;
}
public final function equals(Item $item, $checkDamage = false){
return $this->id === $item->getId() and ($checkDamage === false or $this->getDamage() === $item->getDamage());
public final function equals(Item $item, $checkDamage = true, $checkCompound = true){
return $this->id === $item->getId() and ($checkDamage === false or $this->getDamage() === $item->getDamage()) and ($checkCompound === false or $this->getCompoundTag() === $item->getCompoundTag());
}
}