Merge branch 'stable'

# Conflicts:
#	composer.lock
#	resources/vanilla
#	src/VersionInfo.php
#	src/pocketmine/block/Podzol.php
This commit is contained in:
Dylan K. Taylor
2020-07-21 11:57:24 +01:00
3 changed files with 9 additions and 2 deletions

View File

@ -26,6 +26,6 @@ namespace pocketmine\block;
class Podzol extends Opaque{
public function __construct(BlockIdentifier $idInfo, string $name, ?BlockBreakInfo $breakInfo = null){
parent::__construct($idInfo, $name, $breakInfo ?? new BlockBreakInfo(2.5, BlockToolType::SHOVEL));
parent::__construct($idInfo, $name, $breakInfo ?? new BlockBreakInfo(0.5, BlockToolType::SHOVEL));
}
}