mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-26 04:43:45 +00:00
Code Issues Projects Releases Wiki Activity

More usages of Item->isNull()

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-10-16 12:29:39 +01:00
parent fd847f02ad
commit 3b5eb45ff5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/entity/Human.php
View File

@ -485,7 +485,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
$slotCount = $this->inventory->getSize() + $this->inventory->getHotbarSize();
for($slot = $this->inventory->getHotbarSize(); $slot < $slotCount; ++$slot){
$item = $this->inventory->getItem($slot - 9);
if($item->getId() !== ItemItem::AIR){
if(!$item->isNull()){
$this->namedtag->Inventory[$slot] = $item->nbtSerialize($slot);
}
}
@ -493,7 +493,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
//Armor
for($slot = 100; $slot < 104; ++$slot){
$item = $this->inventory->getItem($this->inventory->getSize() + $slot - 100);
if($item instanceof ItemItem and $item->getId() !== ItemItem::AIR){
if(!$item->isNull()){
$this->namedtag->Inventory[$slot] = $item->nbtSerialize($slot);
}
}

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

@ -216,7 +216,7 @@ class Furnace extends Spawnable implements InventoryHolder, Container, Nameable{
$raw = $this->inventory->getSmelting();
$product = $this->inventory->getResult();
$smelt = $this->server->getCraftingManager()->matchFurnaceRecipe($raw);
$canSmelt = ($smelt instanceof FurnaceRecipe and $raw->getCount() > 0 and (($smelt->getResult()->equals($product) and $product->getCount() < $product->getMaxStackSize()) or $product->getId() === Item::AIR));
$canSmelt = ($smelt instanceof FurnaceRecipe and $raw->getCount() > 0 and (($smelt->getResult()->equals($product) and $product->getCount() < $product->getMaxStackSize()) or $product->isNull()));
if($this->namedtag->BurnTime->getValue() <= 0 and $canSmelt and $fuel->getFuelTime() > 0 and $fuel->getCount() > 0){
$this->checkFuel($fuel);