mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-10-18 12:04:46 +00:00
Merge branch 'stable'
# Conflicts: # composer.lock # resources/vanilla # src/VersionInfo.php # src/pocketmine/block/Podzol.php
This commit is contained in:
@@ -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));
|
||||
}
|
||||
}
|
||||
|
@@ -74,7 +74,7 @@ class WhitelistCommand extends VanillaCommand{
|
||||
case "list":
|
||||
$entries = $sender->getServer()->getWhitelisted()->getAll(true);
|
||||
sort($entries, SORT_STRING);
|
||||
$result = implode($entries, ", ");
|
||||
$result = implode(", ", $entries);
|
||||
$count = count($entries);
|
||||
|
||||
$sender->sendMessage(new TranslationContainer("commands.whitelist.list", [$count, $count]));
|
||||
|
Reference in New Issue
Block a user