From 0ac7164b16cd3cf2802ed1767552280749d61c19 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 16 Feb 2019 11:54:09 +0000 Subject: [PATCH] Inventory: remove dropContents(), remove circular dependency --- src/pocketmine/inventory/BaseInventory.php | 17 ----------------- src/pocketmine/inventory/Inventory.php | 11 ----------- 2 files changed, 28 deletions(-) diff --git a/src/pocketmine/inventory/BaseInventory.php b/src/pocketmine/inventory/BaseInventory.php index 2be0a0ef1..4ac258e93 100644 --- a/src/pocketmine/inventory/BaseInventory.php +++ b/src/pocketmine/inventory/BaseInventory.php @@ -26,8 +26,6 @@ namespace pocketmine\inventory; use pocketmine\event\inventory\InventoryOpenEvent; use pocketmine\item\Item; use pocketmine\item\ItemFactory; -use pocketmine\level\Level; -use pocketmine\math\Vector3; use pocketmine\network\mcpe\protocol\InventoryContentPacket; use pocketmine\network\mcpe\protocol\InventorySlotPacket; use pocketmine\network\mcpe\protocol\types\ContainerIds; @@ -146,21 +144,6 @@ abstract class BaseInventory implements Inventory{ } } - /** - * Drops the contents of the inventory into the specified Level at the specified position and clears the inventory - * contents. - * - * @param Level $level - * @param Vector3 $position - */ - public function dropContents(Level $level, Vector3 $position) : void{ - foreach($this->getContents() as $item){ - $level->dropItem($position, $item); - } - - $this->clearAll(); - } - public function setItem(int $index, Item $item, bool $send = true) : bool{ if($item->isNull()){ $item = ItemFactory::get(Item::AIR, 0, 0); diff --git a/src/pocketmine/inventory/Inventory.php b/src/pocketmine/inventory/Inventory.php index f605961c1..cf251d03e 100644 --- a/src/pocketmine/inventory/Inventory.php +++ b/src/pocketmine/inventory/Inventory.php @@ -27,8 +27,6 @@ declare(strict_types=1); namespace pocketmine\inventory; use pocketmine\item\Item; -use pocketmine\level\Level; -use pocketmine\math\Vector3; use pocketmine\Player; interface Inventory{ @@ -122,15 +120,6 @@ interface Inventory{ */ public function setContents(array $items, bool $send = true) : void; - /** - * Drops the contents of the inventory into the specified Level at the specified position and clears the inventory - * contents. - * - * @param Level $level - * @param Vector3 $position - */ - public function dropContents(Level $level, Vector3 $position) : void; - /** * @param Player|Player[] $target */