mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 19:02:59 +00:00
Code Issues Projects Releases Wiki Activity

Items can be picked up

Browse Source
This commit is contained in:
Shoghi Cervantes
2014-05-25 21:57:58 +02:00
parent 03d7127e33
commit 274f972b58
7 changed files with 109 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,25 +202,44 @@ abstract class BaseInventory implements Inventory{
return -1;
}
public function canAddItem(Item $item){
$item = clone $item;
$checkDamage = $item->getDamage() === null ? false : true;
for($i = 0; $i < $this->getSize(); ++$i){
$slot = $this->getItem($i);
if($item->equals($slot, $checkDamage)){
if(($diff = $slot->getMaxStackSize() - $slot->getCount()) > 0){
$item->setCount($item->getCount() - $diff);
}
}elseif($slot->getID() === Item::AIR){
$item->setCount($item->getCount() - $this->getMaxStackSize());
}
if($item->getCount() <= 0){
return true;
}
}
return false;
}
public function addItem(){
/** @var Item[] $slots */
$slots = func_get_args();
foreach($slots as $i => $slot){
if($slot->getCount() > $slot->getMaxStackSize()){
while($slot->getCount() > $slot->getMaxStackSize()){
$slots[] = Item::get($slot->getID(), $slot->getDamage(), $slot->getMaxStackSize());
$slot->setCount($slot->getCount() - $slot->getMaxStackSize());
if(count($slots) > $this->getSize()){ //Protect against large give commands
break;
}
while($slot->getCount() > $slot->getMaxStackSize()){
$slots[] = Item::get($slot->getID(), $slot->getDamage(), $slot->getMaxStackSize());
$slot->setCount($slot->getCount() - $slot->getMaxStackSize());
if(count($slots) > $this->getSize()){ //Protect against large give commands
break;
}
}
}
for($i = 0; $i < $this->size; ++$i){
for($i = 0; $i < $this->getSize(); ++$i){
$item = $this->getItem($i);
if($item->getID() === Item::AIR){
$item = array_shift($slots);
$this->setItem($i, $item);
$this->setItem($i, array_shift($slots));
$item = $this->getItem($i);
}
foreach($slots as $index => $slot){
@ -242,14 +261,13 @@ abstract class BaseInventory implements Inventory{
break;
}
}
return $slots;
}
public function removeItem(){
/** @var Item[] $slots */
$slots = func_get_args();
for($i = 0; $i < $this->size; ++$i){
for($i = 0; $i < $this->getSize(); ++$i){
$item = $this->getItem($i);
if($item->getID() === Item::AIR){
continue;

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

@ -62,7 +62,7 @@ interface Inventory{
public function setItem($index, Item $item);
/**
* Stores the given Item in the inventory. This will try to fill
* Stores the given Items in the inventory. This will try to fill
* existing stacks and empty slots as well as it can.
*
* Returns the Items that did not fit
@ -73,6 +73,15 @@ interface Inventory{
*/
public function addItem();
/**
* Checks if a given Item can be added to the inventory
*
* @param Item $item
*
* @return bool
*/
public function canAddItem(Item $item);
/**
* Removes the given Item from the inventory.
* It will return the Items that couldn't be removed.

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

@ -114,10 +114,6 @@ class PlayerInventory extends BaseInventory{
$this->setHotbarSlotIndex($this->itemInHandIndex, $slot);
$this->sendHeldItem($this->getHolder()->getViewers());
if($this->getHolder() instanceof Player){
$this->sendHeldItem($this->getHolder());
}
}
}