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

Merge commit 'fcc9e62c6'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/network/mcpe/protocol/types/command/CommandEnum.php
#	src/pocketmine/Player.php
This commit is contained in:
Dylan K. Taylor 2020-06-13 11:49:52 +01:00
commit 70ca12bb90
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/network/mcpe/NetworkSession.php
View File

@ -102,6 +102,7 @@ use pocketmine\utils\TextFormat;
use pocketmine\utils\Utils; use pocketmine\utils\Utils;
use pocketmine\world\Position; use pocketmine\world\Position;
use function array_map; use function array_map;
use function array_values;
use function assert; use function assert;
use function base64_encode; use function base64_encode;
use function bin2hex; use function bin2hex;
@ -758,7 +759,7 @@ class NetworkSession{
//work around a client bug which makes the original name not show when aliases are used //work around a client bug which makes the original name not show when aliases are used
$aliases[] = $lname; $aliases[] = $lname;
} }
$aliasObj = new CommandEnum(ucfirst($command->getName()) . "Aliases", $aliases); $aliasObj = new CommandEnum(ucfirst($command->getName()) . "Aliases", array_values($aliases));
} }
$data = new CommandData( $data = new CommandData(

7
src/network/mcpe/protocol/types/command/CommandEnum.php
View File

@ -26,11 +26,15 @@ namespace pocketmine\network\mcpe\protocol\types\command;
class CommandEnum{ class CommandEnum{
/** @var string */ /** @var string */
private $enumName; private $enumName;
/** @var string[] */ /**
* @var string[]
* @phpstan-var list<string>
*/
private $enumValues = []; private $enumValues = [];
/** /**
* @param string[] $enumValues * @param string[] $enumValues
* @phpstan-param list<string> $enumValues
*/ */
public function __construct(string $enumName, array $enumValues){ public function __construct(string $enumName, array $enumValues){
$this->enumName = $enumName; $this->enumName = $enumName;
@ -43,6 +47,7 @@ class CommandEnum{
/** /**
* @return string[] * @return string[]
* @phpstan-return list<string>
*/ */
public function getValues() : array{ public function getValues() : array{
return $this->enumValues; return $this->enumValues;