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

Improved safe_var_dump(), Inventory::addItem() Inventory::removeItem() using argument unpacking

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-08-27 12:29:04 +02:00
parent 759d7e2545
commit 8e9da9c84e
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/PocketMine.php
View File

@ -20,9 +20,9 @@
*/ */
namespace { namespace {
function safe_var_dump(){ function safe_var_dump(...$params){
static $cnt = 0; static $cnt = 0;
foreach(func_get_args() as $var){ foreach($params as $var){
switch(true){ switch(true){
case is_array($var): case is_array($var):
echo str_repeat(" ", $cnt) . "array(" . count($var) . ") {" . PHP_EOL; echo str_repeat(" ", $cnt) . "array(" . count($var) . ") {" . PHP_EOL;

6
src/pocketmine/inventory/BaseInventory.php
View File

@ -225,9 +225,8 @@ abstract class BaseInventory implements Inventory{
return false; return false;
} }
public function addItem(){ public function addItem(...$slots){
/** @var Item[] $slots */ /** @var Item[] $slots */
$slots = func_get_args();
foreach($slots as $i => $slot){ foreach($slots as $i => $slot){
$slots[$i] = clone $slot; $slots[$i] = clone $slot;
} }
@ -264,9 +263,8 @@ abstract class BaseInventory implements Inventory{
return $slots; return $slots;
} }
public function removeItem(){ public function removeItem(...$slots){
/** @var Item[] $slots */ /** @var Item[] $slots */
$slots = func_get_args();
for($i = 0; $i < $this->getSize(); ++$i){ for($i = 0; $i < $this->getSize(); ++$i){
$item = $this->getItem($i); $item = $this->getItem($i);
if($item->getID() === Item::AIR){ if($item->getID() === Item::AIR){

4
src/pocketmine/inventory/Inventory.php
View File

@ -73,7 +73,7 @@ interface Inventory{
* *
* @return Item[] * @return Item[]
*/ */
public function addItem(); public function addItem(...$slots);
/** /**
* Checks if a given Item can be added to the inventory * Checks if a given Item can be added to the inventory
@ -92,7 +92,7 @@ interface Inventory{
* *
* @return Item[] * @return Item[]
*/ */
public function removeItem(); public function removeItem(...$slots);
/** /**
* @return Item[] * @return Item[]