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

Move block-breaking tool-type constants to a BlockToolType interface

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-11-24 11:19:19 +00:00
parent 7e3cd24444
commit 55d0684565
100 changed files with 147 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,6 @@ use pocketmine\entity\Entity;
use pocketmine\item\Item;
use pocketmine\item\ItemFactory;
use pocketmine\item\TieredTool;
use pocketmine\item\Tool;
use pocketmine\level\Level;
use pocketmine\level\MovingObjectPosition;
use pocketmine\level\Position;
@ -223,12 +222,12 @@ class Block extends Position implements BlockIds, Metadatable{
public function getBreakTime(Item $item) : float{
$base = $this->getHardness() * 1.5;
if($this->canBeBrokenWith($item)){
if($this->getToolType() === Tool::TYPE_SHEARS and $item->isShears()){
if($this->getToolType() === BlockToolType::TYPE_SHEARS and $item->isShears()){
$base /= 15;
}elseif(
($this->getToolType() === Tool::TYPE_PICKAXE and ($tier = $item->isPickaxe()) !== false) or
($this->getToolType() === Tool::TYPE_AXE and ($tier = $item->isAxe()) !== false) or
($this->getToolType() === Tool::TYPE_SHOVEL and ($tier = $item->isShovel()) !== false)
($this->getToolType() === BlockToolType::TYPE_PICKAXE and ($tier = $item->isPickaxe()) !== false) or
($this->getToolType() === BlockToolType::TYPE_AXE and ($tier = $item->isAxe()) !== false) or
($this->getToolType() === BlockToolType::TYPE_SHOVEL and ($tier = $item->isShovel()) !== false)
){
switch($tier){
case TieredTool::TIER_WOODEN:
@ -320,7 +319,7 @@ class Block extends Position implements BlockIds, Metadatable{
* @return int
*/
public function getToolType() : int{
return Tool::TYPE_NONE;
return BlockToolType::TYPE_NONE;
}
/**