diff --git a/src/pocketmine/inventory/BaseInventory.php b/src/pocketmine/inventory/BaseInventory.php index 9f46d8a05..09dbd24c2 100644 --- a/src/pocketmine/inventory/BaseInventory.php +++ b/src/pocketmine/inventory/BaseInventory.php @@ -113,9 +113,7 @@ abstract class BaseInventory implements Inventory{ for($i = 0, $size = $this->getSize(); $i < $size; ++$i){ if(!isset($items[$i])){ - if($this->slots[$i] !== null){ - $this->clear($i, false); - } + $this->clear($i, false); }else{ $this->setItem($i, $items[$i], false); } diff --git a/src/pocketmine/inventory/DoubleChestInventory.php b/src/pocketmine/inventory/DoubleChestInventory.php index 9ae689fe2..afa9a39d6 100644 --- a/src/pocketmine/inventory/DoubleChestInventory.php +++ b/src/pocketmine/inventory/DoubleChestInventory.php @@ -27,7 +27,6 @@ use pocketmine\block\tile\Chest; use pocketmine\item\Item; use pocketmine\Player; use function array_merge; -use function array_slice; use function count; class DoubleChestInventory extends ChestInventory implements InventoryHolder{ @@ -75,29 +74,6 @@ class DoubleChestInventory extends ChestInventory implements InventoryHolder{ return $result; } - /** - * @param Item[] $items - * @param bool $send - */ - public function setContents(array $items, bool $send = true) : void{ - $size = $this->getSize(); - if(count($items) > $size){ - $items = array_slice($items, 0, $size, true); - } - - for($i = 0; $i < $size; ++$i){ - if(!isset($items[$i])){ - $this->clear($i, false); - }else{ - $this->setItem($i, $items[$i], false); - } - } - - if($send){ - $this->sendContents($this->getViewers()); - } - } - protected function onOpen(Player $who) : void{ parent::onOpen($who);