From e58db7539647a0a22a980b4795b20563bb8be89a Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 11 Dec 2017 16:31:43 +0000 Subject: [PATCH] Level: Remove redundant null checks from useBreakOn() These checks are not needed as of 3eae7a187524233f35deae028b01cf58ccd48157. --- src/pocketmine/level/Level.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php index 8a5530ee6..b62e143ec 100644 --- a/src/pocketmine/level/Level.php +++ b/src/pocketmine/level/Level.php @@ -1721,7 +1721,7 @@ class Level implements ChunkManager, Metadatable{ if($player !== null){ $ev = new BlockBreakEvent($player, $target, $item, $player->isCreative() or $player->allowInstaBreak()); - if(($player->isSurvival() and $item instanceof Item and !$target->isBreakable($item)) or $player->isSpectator()){ + if(($player->isSurvival() and !$target->isBreakable($item)) or $player->isSpectator()){ $ev->setCancelled(); }elseif($this->checkSpawnProtection($player, $target)){ $ev->setCancelled(); //set it to cancelled so plugins can bypass this @@ -1774,7 +1774,7 @@ class Level implements ChunkManager, Metadatable{ $drops = $ev->getDrops(); - }elseif($item !== null and !$target->isBreakable($item)){ + }elseif(!$target->isBreakable($item)){ return false; }else{ $drops = $target->getDrops($item); //Fixes tile entities being deleted before getting drops @@ -1804,9 +1804,7 @@ class Level implements ChunkManager, Metadatable{ $tile->close(); } - if($item !== null){ - $item->useOn($target); - } + $item->useOn($target); if($player === null or $player->isSurvival()){ foreach($drops as $drop){