mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-17 19:50:18 +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
parent ee6b980b98 fcc9e62c65
commit 70ca12bb90
2 changed files with 8 additions and 2 deletions
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\world\Position;
use function array_map;
use function array_values;
use function assert;
use function base64_encode;
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
$aliases[] = $lname;
}
$aliasObj = new CommandEnum(ucfirst($command->getName()) . "Aliases", $aliases);
$aliasObj = new CommandEnum(ucfirst($command->getName()) . "Aliases", array_values($aliases));
}
$data = new CommandData(