From 8e9da9c84e9f9259456337150131b6d5fd4e3e20 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Wed, 27 Aug 2014 12:29:04 +0200
Subject: [PATCH] Improved safe_var_dump(), Inventory::addItem()
 Inventory::removeItem() using argument unpacking

---
 src/pocketmine/PocketMine.php              | 4 ++--
 src/pocketmine/inventory/BaseInventory.php | 6 ++----
 src/pocketmine/inventory/Inventory.php     | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php
index cca5cb1ad..4095c090f 100644
--- a/src/pocketmine/PocketMine.php
+++ b/src/pocketmine/PocketMine.php
@@ -20,9 +20,9 @@
 */
 
 namespace {
-	function safe_var_dump(){
+	function safe_var_dump(...$params){
 		static $cnt = 0;
-		foreach(func_get_args() as $var){
+		foreach($params as $var){
 			switch(true){
 				case is_array($var):
 					echo str_repeat("  ", $cnt) . "array(" . count($var) . ") {" . PHP_EOL;
diff --git a/src/pocketmine/inventory/BaseInventory.php b/src/pocketmine/inventory/BaseInventory.php
index e36dfbdd7..75583b7d5 100644
--- a/src/pocketmine/inventory/BaseInventory.php
+++ b/src/pocketmine/inventory/BaseInventory.php
@@ -225,9 +225,8 @@ abstract class BaseInventory implements Inventory{
 		return false;
 	}
 
-	public function addItem(){
+	public function addItem(...$slots){
 		/** @var Item[] $slots */
-		$slots = func_get_args();
 		foreach($slots as $i => $slot){
 			$slots[$i] = clone $slot;
 		}
@@ -264,9 +263,8 @@ abstract class BaseInventory implements Inventory{
 		return $slots;
 	}
 
-	public function removeItem(){
+	public function removeItem(...$slots){
 		/** @var Item[] $slots */
-		$slots = func_get_args();
 		for($i = 0; $i < $this->getSize(); ++$i){
 			$item = $this->getItem($i);
 			if($item->getID() === Item::AIR){
diff --git a/src/pocketmine/inventory/Inventory.php b/src/pocketmine/inventory/Inventory.php
index a61baae75..fc3fc3bbf 100644
--- a/src/pocketmine/inventory/Inventory.php
+++ b/src/pocketmine/inventory/Inventory.php
@@ -73,7 +73,7 @@ interface Inventory{
 	 *
 	 * @return Item[]
 	 */
-	public function addItem();
+	public function addItem(...$slots);
 
 	/**
 	 * Checks if a given Item can be added to the inventory
@@ -92,7 +92,7 @@ interface Inventory{
 	 *
 	 * @return Item[]
 	 */
-	public function removeItem();
+	public function removeItem(...$slots);
 
 	/**
 	 * @return Item[]