mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-23 19:34:15 +00:00
Code Issues Projects Releases Wiki Activity

Level: Remove redundant null checks from useBreakOn()

Browse Source 
These checks are not needed as of 3eae7a187524233f35deae028b01cf58ccd48157.
This commit is contained in:
Dylan K. Taylor 2017-12-11 16:31:43 +00:00
parent a94c669730
commit e58db75396
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/level/Level.php
View File

@ -1721,7 +1721,7 @@ class Level implements ChunkManager, Metadatable{
if($player !== null){ if($player !== null){
$ev = new BlockBreakEvent($player, $target, $item, $player->isCreative() or $player->allowInstaBreak()); $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(); $ev->setCancelled();
}elseif($this->checkSpawnProtection($player, $target)){ }elseif($this->checkSpawnProtection($player, $target)){
$ev->setCancelled(); //set it to cancelled so plugins can bypass this $ev->setCancelled(); //set it to cancelled so plugins can bypass this
@ -1774,7 +1774,7 @@ class Level implements ChunkManager, Metadatable{
$drops = $ev->getDrops(); $drops = $ev->getDrops();
}elseif($item !== null and !$target->isBreakable($item)){ }elseif(!$target->isBreakable($item)){
return false; return false;
}else{ }else{
$drops = $target->getDrops($item); //Fixes tile entities being deleted before getting drops $drops = $target->getDrops($item); //Fixes tile entities being deleted before getting drops
@ -1804,9 +1804,7 @@ class Level implements ChunkManager, Metadatable{
$tile->close(); $tile->close();
} }
if($item !== null){ $item->useOn($target);
$item->useOn($target);
}
if($player === null or $player->isSurvival()){ if($player === null or $player->isSurvival()){
foreach($drops as $drop){ foreach($drops as $drop){