mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 20:28:31 +00:00
Code Issues Projects Releases Wiki Activity

Fixed merge error

Browse Source
This commit is contained in:
Dylan K. Taylor 2023-05-06 17:29:59 +01:00
parent 5c7f4570b4
commit 7cdf6b0946
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/inventory/SimpleInventory.php
View File

@ -86,7 +86,7 @@ class SimpleInventory extends BaseInventory{
protected function getMatchingItemCount(int $slot, Item $test, bool $checkTags) : int{ protected function getMatchingItemCount(int $slot, Item $test, bool $checkTags) : int{
$slotItem = $this->slots[$slot]; $slotItem = $this->slots[$slot];
return $slotItem !== null && $slotItem->equals($test, $checkDamage, $checkTags) ? $slotItem->getCount() : 0; return $slotItem !== null && $slotItem->equals($test, true, $checkTags) ? $slotItem->getCount() : 0;
} }
public function isSlotEmpty(int $index) : bool{ public function isSlotEmpty(int $index) : bool{