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

Merge branch 'stable'

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-02-01 21:03:21 +00:00
commit e3833ba4f0
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Server.php
View File

@ -1139,7 +1139,7 @@ class Server{
/** /**
* @param TextContainer|string $message * @param TextContainer|string $message
* @param CommandSender[] $recipients * @param CommandSender[]|null $recipients
*/ */
public function broadcastMessage($message, ?array $recipients = null) : int{ public function broadcastMessage($message, ?array $recipients = null) : int{
if(!is_array($recipients)){ if(!is_array($recipients)){
@ -1168,7 +1168,7 @@ class Server{
} }
/** /**
* @param Player[] $recipients * @param Player[]|null $recipients
*/ */
public function broadcastTip(string $tip, ?array $recipients = null) : int{ public function broadcastTip(string $tip, ?array $recipients = null) : int{
$recipients = $recipients ?? $this->selectPermittedPlayers(self::BROADCAST_CHANNEL_USERS); $recipients = $recipients ?? $this->selectPermittedPlayers(self::BROADCAST_CHANNEL_USERS);
@ -1181,7 +1181,7 @@ class Server{
} }
/** /**
* @param Player[] $recipients * @param Player[]|null $recipients
*/ */
public function broadcastPopup(string $popup, ?array $recipients = null) : int{ public function broadcastPopup(string $popup, ?array $recipients = null) : int{
$recipients = $recipients ?? $this->selectPermittedPlayers(self::BROADCAST_CHANNEL_USERS); $recipients = $recipients ?? $this->selectPermittedPlayers(self::BROADCAST_CHANNEL_USERS);

4
src/world/format/io/WritableWorldProvider.php
View File

@ -24,13 +24,15 @@ declare(strict_types=1);
namespace pocketmine\world\format\io; namespace pocketmine\world\format\io;
use pocketmine\world\format\Chunk; use pocketmine\world\format\Chunk;
use pocketmine\world\generator\Generator;
interface WritableWorldProvider extends WorldProvider{ interface WritableWorldProvider extends WorldProvider{
/** /**
* Generate the needed files in the path given * Generate the needed files in the path given
* *
* @param mixed[] $options * @param mixed[] $options
* @phpstan-param array<string, mixed> $options * @phpstan-param class-string<Generator> $generator
* @phpstan-param array<string, mixed> $options
*/ */
public static function generate(string $path, string $name, int $seed, string $generator, array $options = []) : void; public static function generate(string $path, string $name, int $seed, string $generator, array $options = []) : void;