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

Rename Block->canBeBrokenWith() to isCompatibleWithTool() and add documentation

Browse Source 
This name better describes it. "can be broken with" implies that items which this returns false for cannot destroy the block at all, which is incorrect. What this actually returns is whether the item is the best tool to use to break the block.
This commit is contained in:
Dylan K. Taylor
2017-12-12 19:51:31 +00:00
parent 0004e7429f
commit da3640357c
11 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/pocketmine/block/Block.php
View File

@ -218,7 +218,18 @@ class Block extends Position implements BlockIds, Metadatable{
return 0;
}
public function canBeBrokenWith(Item $item) : bool{
/**
* Returns whether the specified item is the proper tool to use for breaking this block. This checks tool type and
* harvest level requirement.
*
* In most cases this is also used to determine whether block drops should be created or not, except in some
* special cases such as vines.
*
* @param Item $tool
*
* @return bool
*/
public function isCompatibleWithTool(Item $tool) : bool{
if($this->getHardness() < 0){
return false;
}
@ -226,7 +237,7 @@ class Block extends Position implements BlockIds, Metadatable{
$toolType = $this->getToolType();
$harvestLevel = $this->getToolHarvestLevel();
return $toolType === BlockToolType::TYPE_NONE or $harvestLevel === 0 or (
($toolType & $item->getBlockToolType()) !== 0 and $item->getBlockToolHarvestLevel() >= $harvestLevel);
($toolType & $tool->getBlockToolType()) !== 0 and $tool->getBlockToolHarvestLevel() >= $harvestLevel);
}
/**
@ -251,7 +262,7 @@ class Block extends Position implements BlockIds, Metadatable{
*/
public function getBreakTime(Item $item) : float{
$base = $this->getHardness();
if($this->canBeBrokenWith($item)){
if($this->isCompatibleWithTool($item)){
$base *= 1.5;
}else{
$base *= 5;
@ -422,7 +433,7 @@ class Block extends Position implements BlockIds, Metadatable{
* @return Item[]
*/
public function getDrops(Item $item) : array{
if($this->canBeBrokenWith($item)){
if($this->isCompatibleWithTool($item)){
return [
ItemFactory::get($this->getItemId(), $this->getVariant(), 1)
];