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

Remove Tool <-> Block circular dependency in efficiency calculation

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-03-01 18:18:56 +00:00
parent 72233a509d
commit d961b272c7
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,7 +325,7 @@ class Block extends Position implements BlockIds, Metadatable{
$base *= 5; $base *= 5;
} }
$efficiency = $item->getMiningEfficiency($this); $efficiency = $item->getMiningEfficiency(($this->getToolType() & $item->getBlockToolType()) !== 0);
if($efficiency <= 0){ if($efficiency <= 0){
throw new \InvalidArgumentException(get_class($item) . " has invalid mining efficiency: expected >= 0, got $efficiency"); throw new \InvalidArgumentException(get_class($item) . " has invalid mining efficiency: expected >= 0, got $efficiency");
} }

2
src/pocketmine/item/Item.php
View File

@ -726,7 +726,7 @@ class Item implements ItemIds, \JsonSerializable{
return 0; return 0;
} }
public function getMiningEfficiency(Block $block) : float{ public function getMiningEfficiency(bool $isCorrectTool) : float{
return 1; return 1;
} }

4
src/pocketmine/item/Sword.php
View File

@ -41,8 +41,8 @@ class Sword extends TieredTool{
return 1; return 1;
} }
public function getMiningEfficiency(Block $block) : float{ public function getMiningEfficiency(bool $isCorrectTool) : float{
return parent::getMiningEfficiency($block) * 1.5; //swords break any block 1.5x faster than hand return parent::getMiningEfficiency($isCorrectTool) * 1.5; //swords break any block 1.5x faster than hand
} }
protected function getBaseMiningEfficiency() : float{ protected function getBaseMiningEfficiency() : float{

5
src/pocketmine/item/Tool.php
View File

@ -23,7 +23,6 @@ declare(strict_types=1);
namespace pocketmine\item; namespace pocketmine\item;
use pocketmine\block\Block;
use pocketmine\item\enchantment\Enchantment; use pocketmine\item\enchantment\Enchantment;
abstract class Tool extends Durable{ abstract class Tool extends Durable{
@ -32,9 +31,9 @@ abstract class Tool extends Durable{
return 1; return 1;
} }
public function getMiningEfficiency(Block $block) : float{ public function getMiningEfficiency(bool $isCorrectTool) : float{
$efficiency = 1; $efficiency = 1;
if(($block->getToolType() & $this->getBlockToolType()) !== 0){ if($isCorrectTool){
$efficiency = $this->getBaseMiningEfficiency(); $efficiency = $this->getBaseMiningEfficiency();
if(($enchantmentLevel = $this->getEnchantmentLevel(Enchantment::EFFICIENCY())) > 0){ if(($enchantmentLevel = $this->getEnchantmentLevel(Enchantment::EFFICIENCY())) > 0){
$efficiency += ($enchantmentLevel ** 2 + 1); $efficiency += ($enchantmentLevel ** 2 + 1);