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

QueryInfo->setPlayerList() now accepts string[] instead of Player[] (#5476)

Browse Source
This commit is contained in:
BrandPVP 2022-12-31 16:04:22 +03:00 committed by GitHub
parent 2da9b76452
commit 42db3abf5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/network/query/QueryInfo.php
View File

@ -29,6 +29,7 @@ use pocketmine\plugin\Plugin;
use pocketmine\Server; use pocketmine\Server;
use pocketmine\utils\Binary; use pocketmine\utils\Binary;
use pocketmine\utils\Utils; use pocketmine\utils\Utils;
use function array_map;
use function chr; use function chr;
use function count; use function count;
use function str_replace; use function str_replace;
@ -41,7 +42,7 @@ final class QueryInfo{
private bool $listPlugins; private bool $listPlugins;
/** @var Plugin[] */ /** @var Plugin[] */
private array $plugins; private array $plugins;
/** @var Player[] */ /** @var string[] */
private array $players; private array $players;
private string $gametype; private string $gametype;
@ -67,7 +68,7 @@ final class QueryInfo{
$this->serverName = $server->getMotd(); $this->serverName = $server->getMotd();
$this->listPlugins = $server->getConfigGroup()->getPropertyBool("settings.query-plugins", true); $this->listPlugins = $server->getConfigGroup()->getPropertyBool("settings.query-plugins", true);
$this->plugins = $server->getPluginManager()->getPlugins(); $this->plugins = $server->getPluginManager()->getPlugins();
$this->players = $server->getOnlinePlayers(); $this->players = array_map(fn(Player $p) => $p->getName(), $server->getOnlinePlayers());
$this->gametype = ($server->getGamemode()->equals(GameMode::SURVIVAL()) || $server->getGamemode()->equals(GameMode::ADVENTURE())) ? "SMP" : "CMP"; $this->gametype = ($server->getGamemode()->equals(GameMode::SURVIVAL()) || $server->getGamemode()->equals(GameMode::ADVENTURE())) ? "SMP" : "CMP";
$this->version = $server->getVersion(); $this->version = $server->getVersion();
@ -122,17 +123,17 @@ final class QueryInfo{
} }
/** /**
* @return Player[] * @return string[]
*/ */
public function getPlayerList() : array{ public function getPlayerList() : array{
return $this->players; return $this->players;
} }
/** /**
* @param Player[] $players * @param string[] $players
*/ */
public function setPlayerList(array $players) : void{ public function setPlayerList(array $players) : void{
Utils::validateArrayValueType($players, function(Player $_) : void{}); Utils::validateArrayValueType($players, function(string $_) : void{});
$this->players = $players; $this->players = $players;
$this->destroyCache(); $this->destroyCache();
} }
@ -226,7 +227,7 @@ final class QueryInfo{
$query .= "\x00\x01player_\x00\x00"; $query .= "\x00\x01player_\x00\x00";
foreach($this->players as $player){ foreach($this->players as $player){
$query .= $player->getName() . "\x00"; $query .= $player . "\x00";
} }
$query .= "\x00"; $query .= "\x00";