mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 01:46:04 +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
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){
$item->setCount($item->getCount() - $diff);
}
}elseif($slot->getId() === Item::AIR){
}elseif($slot->isNull()){
$item->setCount($item->getCount() - $this->getMaxStackSize());
}
@ -252,7 +252,7 @@ abstract class BaseInventory implements Inventory{
for($i = 0; $i < $this->getSize(); ++$i){
$item = $this->getItem($i);
if($item->getId() === Item::AIR or $item->getCount() <= 0){
if($item->isNull()){
$emptySlots[] = $i;
}
@ -307,7 +307,7 @@ abstract class BaseInventory implements Inventory{
for($i = 0; $i < $this->getSize(); ++$i){
$item = $this->getItem($i);
if($item->getId() === Item::AIR or $item->getCount() <= 0){
if($item->isNull()){
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{
foreach($this->actions as $key => $action){
if($action->getTargetItem()->getId() !== Item::AIR){
if(!$action->getTargetItem()->isNull()){
$needItems[] = $action->getTargetItem();
}
@ -113,7 +113,7 @@ class SimpleInventoryTransaction implements InventoryTransaction{
return false;
}
if($action->getSourceItem()->getId() !== Item::AIR){
if(!$action->getSourceItem()->isNull()){
$haveItems[] = $action->getSourceItem();
}
}