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

Use Item->isNull() more

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-09-21 10:29:29 +01:00
parent 61cfdac6a1
commit ef6250967f
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,7 +226,7 @@ abstract class BaseInventory implements Inventory{
if(($diff = $slot->getMaxStackSize() - $slot->getCount()) > 0){ if(($diff = $slot->getMaxStackSize() - $slot->getCount()) > 0){
$item->setCount($item->getCount() - $diff); $item->setCount($item->getCount() - $diff);
} }
}elseif($slot->getId() === Item::AIR){ }elseif($slot->isNull()){
$item->setCount($item->getCount() - $this->getMaxStackSize()); $item->setCount($item->getCount() - $this->getMaxStackSize());
} }
@ -252,7 +252,7 @@ abstract class BaseInventory implements Inventory{
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 or $item->getCount() <= 0){ if($item->isNull()){
$emptySlots[] = $i; $emptySlots[] = $i;
} }
@ -307,7 +307,7 @@ abstract class BaseInventory implements Inventory{
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 or $item->getCount() <= 0){ if($item->isNull()){
continue; continue;
} }

4
src/pocketmine/inventory/transaction/SimpleInventoryTransaction.php
View File

@ -105,7 +105,7 @@ class SimpleInventoryTransaction implements InventoryTransaction{
*/ */
protected function matchItems(array &$needItems, array &$haveItems) : bool{ protected function matchItems(array &$needItems, array &$haveItems) : bool{
foreach($this->actions as $key => $action){ foreach($this->actions as $key => $action){
if($action->getTargetItem()->getId() !== Item::AIR){ if(!$action->getTargetItem()->isNull()){
$needItems[] = $action->getTargetItem(); $needItems[] = $action->getTargetItem();
} }
@ -113,7 +113,7 @@ class SimpleInventoryTransaction implements InventoryTransaction{
return false; return false;
} }
if($action->getSourceItem()->getId() !== Item::AIR){ if(!$action->getSourceItem()->isNull()){
$haveItems[] = $action->getSourceItem(); $haveItems[] = $action->getSourceItem();
} }
} }

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

@ -135,7 +135,7 @@ class Chest extends Spawnable implements InventoryHolder, Container, Nameable{
$d = $item->nbtSerialize($index); $d = $item->nbtSerialize($index);
if($item->getId() === Item::AIR or $item->getCount() <= 0){ if($item->isNull()){
if($i >= 0){ if($i >= 0){
unset($this->namedtag->Items[$i]); unset($this->namedtag->Items[$i]);
} }

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

@ -80,7 +80,7 @@ class FlowerPot extends Spawnable{
} }
public function isEmpty() : bool{ public function isEmpty() : bool{
return $this->getItem()->getId() === Item::AIR; return $this->getItem()->isNull();
} }
public function addAdditionalSpawnData(CompoundTag $nbt){ public function addAdditionalSpawnData(CompoundTag $nbt){

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

@ -159,7 +159,7 @@ class Furnace extends Spawnable implements InventoryHolder, Container, Nameable{
$d = $item->nbtSerialize($index); $d = $item->nbtSerialize($index);
if($item->getId() === Item::AIR or $item->getCount() <= 0){ if($item->isNull()){
if($i >= 0){ if($i >= 0){
unset($this->namedtag->Items[$i]); unset($this->namedtag->Items[$i]);
} }

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

@ -45,7 +45,7 @@ class ItemFrame extends Spawnable{
} }
public function hasItem() : bool{ public function hasItem() : bool{
return $this->getItem()->getId() !== Item::AIR; return !$this->getItem()->isNull();
} }
public function getItem() : Item{ public function getItem() : Item{
@ -57,7 +57,7 @@ class ItemFrame extends Spawnable{
} }
public function setItem(Item $item = null){ public function setItem(Item $item = null){
if($item !== null and $item->getId() !== Item::AIR){ if($item !== null and !$item->isNull()){
$this->namedtag->Item = $item->nbtSerialize(-1, "Item"); $this->namedtag->Item = $item->nbtSerialize(-1, "Item");
}else{ }else{
unset($this->namedtag->Item); unset($this->namedtag->Item);