mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 09:56:06 +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

3
src/pocketmine/tile/Chest.php
View File

@ -27,6 +27,7 @@ use pocketmine\inventory\ChestInventory;
use pocketmine\inventory\DoubleChestInventory;
use pocketmine\inventory\InventoryHolder;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\level\Level;
use pocketmine\math\Vector3;
use pocketmine\nbt\NBT;
@ -113,7 +114,7 @@ class Chest extends Spawnable implements InventoryHolder, Container, Nameable{
public function getItem(int $index) : Item{
$i = $this->getSlotIndex($index);
if($i < 0){
return Item::get(Item::AIR, 0, 0);
return ItemFactory::get(Item::AIR, 0, 0);
}else{
return Item::nbtDeserialize($this->namedtag->Items[$i]);
}

5
src/pocketmine/tile/FlowerPot.php
View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\tile;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\level\Level;
use pocketmine\nbt\tag\CompoundTag;
use pocketmine\nbt\tag\IntTag;
@ -65,7 +66,7 @@ class FlowerPot extends Spawnable{
}
public function getItem() : Item{
return Item::get($this->namedtag->item->getValue(), $this->namedtag->mData->getValue(), 1);
return ItemFactory::get($this->namedtag->item->getValue(), $this->namedtag->mData->getValue(), 1);
}
public function setItem(Item $item){
@ -75,7 +76,7 @@ class FlowerPot extends Spawnable{
}
public function removeItem(){
$this->setItem(Item::get(Item::AIR));
$this->setItem(ItemFactory::get(Item::AIR));
}
public function isEmpty() : bool{

9
src/pocketmine/tile/Furnace.php
View File

@ -31,6 +31,7 @@ use pocketmine\inventory\FurnaceInventory;
use pocketmine\inventory\FurnaceRecipe;
use pocketmine\inventory\InventoryHolder;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\level\Level;
use pocketmine\nbt\NBT;
use pocketmine\nbt\tag\CompoundTag;
@ -141,7 +142,7 @@ class Furnace extends Spawnable implements InventoryHolder, Container, Nameable{
public function getItem(int $index) : Item{
$i = $this->getSlotIndex($index);
if($i < 0){
return Item::get(Item::AIR, 0, 0);
return ItemFactory::get(Item::AIR, 0, 0);
}else{
return Item::nbtDeserialize($this->namedtag->Items[$i]);
}
@ -198,7 +199,7 @@ class Furnace extends Spawnable implements InventoryHolder, Container, Nameable{
if($this->namedtag->BurnTime->getValue() > 0 and $ev->isBurning()){
$fuel->setCount($fuel->getCount() - 1);
if($fuel->getCount() === 0){
$fuel = Item::get(Item::AIR, 0, 0);
$fuel = ItemFactory::get(Item::AIR, 0, 0);
}
$this->inventory->setFuel($fuel);
}
@ -230,7 +231,7 @@ class Furnace extends Spawnable implements InventoryHolder, Container, Nameable{
if($smelt instanceof FurnaceRecipe and $canSmelt){
$this->namedtag->CookTime->setValue($this->namedtag->CookTime->getValue() + 1);
if($this->namedtag->CookTime->getValue() >= 200){ //10 seconds
$product = Item::get($smelt->getResult()->getId(), $smelt->getResult()->getDamage(), $product->getCount() + 1);
$product = ItemFactory::get($smelt->getResult()->getId(), $smelt->getResult()->getDamage(), $product->getCount() + 1);
$this->server->getPluginManager()->callEvent($ev = new FurnaceSmeltEvent($this, $raw, $product));
@ -238,7 +239,7 @@ class Furnace extends Spawnable implements InventoryHolder, Container, Nameable{
$this->inventory->setResult($ev->getResult());
$raw->setCount($raw->getCount() - 1);
if($raw->getCount() === 0){
$raw = Item::get(Item::AIR, 0, 0);
$raw = ItemFactory::get(Item::AIR, 0, 0);
}
$this->inventory->setSmelting($raw);
}

3
src/pocketmine/tile/ItemFrame.php
View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\tile;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\level\Level;
use pocketmine\nbt\tag\ByteTag;
use pocketmine\nbt\tag\CompoundTag;
@ -51,7 +52,7 @@ class ItemFrame extends Spawnable{
if(isset($this->namedtag->Item)){
return Item::nbtDeserialize($this->namedtag->Item);
}else{
return Item::get(Item::AIR);
return ItemFactory::get(Item::AIR);
}
}