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

Merge changes from master

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-04-21 22:48:18 +01:00
parent 2204942338 de95046c11
commit 6ece57e23e
23 changed files with 79 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -945,7 +945,7 @@ class Item implements ItemIds, \JsonSerializable{
*
* @return bool
*/
public final 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 === false or $this->getDamage() === $item->getDamage())){
if($checkCompound){
if($item->getCompoundTag() === $this->getCompoundTag()){
@ -971,7 +971,7 @@ class Item implements ItemIds, \JsonSerializable{
*
* @return bool
*/
public final function deepEquals(Item $item, bool $checkDamage = true, bool $checkCompound = true) : bool{
final public function deepEquals(Item $item, bool $checkDamage = true, bool $checkCompound = true) : bool{
return $this->equals($item, $checkDamage, $checkCompound);
}