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

Merge changes from master

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-08-22 14:13:31 +01:00
parent 4250e99e3a 50580f4408
commit 445a67954d
131 changed files with 690 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@ use pocketmine\entity\Entity;
use pocketmine\event\entity\EntityInventoryChangeEvent;
use pocketmine\event\inventory\InventoryOpenEvent;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\network\mcpe\protocol\InventoryContentPacket;
use pocketmine\network\mcpe\protocol\InventorySlotPacket;
use pocketmine\Player;
@ -99,7 +100,7 @@ abstract class BaseInventory implements Inventory{
}
public function getItem(int $index) : Item{
return $this->slots[$index] !== null ? clone $this->slots[$index] : Item::get(Item::AIR, 0, 0);
return $this->slots[$index] !== null ? clone $this->slots[$index] : ItemFactory::get(Item::AIR, 0, 0);
}
public function getContents() : array{
@ -131,7 +132,7 @@ abstract class BaseInventory implements Inventory{
public function setItem(int $index, Item $item, bool $send = true) : bool{
if($item->isNull()){
$item = Item::get(Item::AIR, 0, 0);
$item = ItemFactory::get(Item::AIR, 0, 0);
}else{
$item = clone $item;
}
@ -332,7 +333,7 @@ abstract class BaseInventory implements Inventory{
}
public function clear(int $index, bool $send = true) : bool{
return $this->setItem($index, Item::get(Item::AIR, 0, 0), $send);
return $this->setItem($index, ItemFactory::get(Item::AIR, 0, 0), $send);
}
public function clearAll(){