From 4b63a22f8c767b466a07de746a4c27e4eefe4ff7 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Wed, 27 Sep 2017 11:05:40 +0100
Subject: [PATCH] More use of Item->isNull()

---
 src/pocketmine/inventory/BaseInventory.php | 4 ++--
 src/pocketmine/level/Level.php             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pocketmine/inventory/BaseInventory.php b/src/pocketmine/inventory/BaseInventory.php
index 4814b720b..20c397d0c 100644
--- a/src/pocketmine/inventory/BaseInventory.php
+++ b/src/pocketmine/inventory/BaseInventory.php
@@ -242,7 +242,7 @@ abstract class BaseInventory implements Inventory{
 		/** @var Item[] $slots */
 		$itemSlots = [];
 		foreach($slots as $slot){
-			if($slot->getId() !== 0 and $slot->getCount() > 0){
+			if(!$slot->isNull()){
 				$itemSlots[] = clone $slot;
 			}
 		}
@@ -299,7 +299,7 @@ abstract class BaseInventory implements Inventory{
 		/** @var Item[] $slots */
 		$itemSlots = [];
 		foreach($slots as $slot){
-			if($slot->getId() !== 0 and $slot->getCount() > 0){
+			if(!$slot->isNull()){
 				$itemSlots[] = clone $slot;
 			}
 		}
diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php
index bce059ee0..561de400b 100644
--- a/src/pocketmine/level/Level.php
+++ b/src/pocketmine/level/Level.php
@@ -1519,7 +1519,7 @@ class Level implements ChunkManager, Metadatable{
 		$itemTag = $item->nbtSerialize();
 		$itemTag->setName("Item");
 
-		if($item->getId() > 0 and $item->getCount() > 0){
+		if(!$item->isNull()){
 			$itemEntity = Entity::createEntity("Item", $this, new CompoundTag("", [
 				new ListTag("Pos", [
 					new DoubleTag("", $source->getX()),
@@ -1682,7 +1682,7 @@ class Level implements ChunkManager, Metadatable{
 
 		if($player === null or $player->isSurvival()){
 			foreach($drops as $drop){
-				if($drop->getCount() > 0){
+				if(!$drop->isNull()){
 					$this->dropItem($vector->add(0.5, 0.5, 0.5), $drop);
 				}
 			}