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

AvailableCommandsPacket: add special handling for enums which aren't referenced by any command directly

Browse Source 
the CommandName enum is a magic enum used by the  argtype.

TODO: It's possible that not sending the CommandName enum might be causing client sided crashes. Investigate.
This commit is contained in:
Dylan K. Taylor 2019-11-30 12:41:44 +00:00
parent 363556e9b6
commit 76bd0f452c
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/pocketmine/network/mcpe/protocol/AvailableCommandsPacket.php
View File

@ -75,6 +75,10 @@ class AvailableCommandsPacket extends DataPacket{
*/ */
public const ARG_FLAG_ENUM = 0x200000; public const ARG_FLAG_ENUM = 0x200000;
public const HARDCODED_ENUM_NAMES = [
"CommandName" => true
];
/** /**
* This is used for /xp <level: int>L. It can only be applied to integer parameters. * This is used for /xp <level: int>L. It can only be applied to integer parameters.
*/ */
@ -86,6 +90,13 @@ class AvailableCommandsPacket extends DataPacket{
*/ */
public $commandData = []; public $commandData = [];
/**
* @var CommandEnum[]
* List of enums which aren't directly referenced by any vanilla command.
* This is used for the `CommandName` enum, which is a magic enum used by the `command` argument type.
*/
public $hardcodedEnums = [];
/** /**
* @var CommandEnum[] * @var CommandEnum[]
* List of dynamic command enums, also referred to as "soft" enums. These can by dynamically updated mid-game * List of dynamic command enums, also referred to as "soft" enums. These can by dynamically updated mid-game
@ -115,7 +126,10 @@ class AvailableCommandsPacket extends DataPacket{
/** @var CommandEnum[] $enums */ /** @var CommandEnum[] $enums */
$enums = []; $enums = [];
for($i = 0, $count = $this->getUnsignedVarInt(); $i < $count; ++$i){ for($i = 0, $count = $this->getUnsignedVarInt(); $i < $count; ++$i){
$enums[] = $this->getEnum($enumValues); $enums[] = $enum = $this->getEnum($enumValues);
if(isset(self::HARDCODED_ENUM_NAMES[$enum->enumName])){
$this->hardcodedEnums[] = $enum;
}
} }
for($i = 0, $count = $this->getUnsignedVarInt(); $i < $count; ++$i){ for($i = 0, $count = $this->getUnsignedVarInt(); $i < $count; ++$i){
@ -404,15 +418,21 @@ class AvailableCommandsPacket extends DataPacket{
$enumIndexes = []; $enumIndexes = [];
/** @var CommandEnum[] $enums */ /** @var CommandEnum[] $enums */
$enums = []; $enums = [];
$addEnumFn = static function(CommandEnum $enum) use (&$enums, &$enumIndexes, &$enumValueIndexes){
if(!isset($enumIndexes[$enum->enumName])){
$enums[$enumIndexes[$enum->enumName] = count($enumIndexes)] = $enum;
}
foreach($enum->enumValues as $str){
$enumValueIndexes[$str] = $enumValueIndexes[$str] ?? count($enumValueIndexes);
}
};
foreach($this->hardcodedEnums as $enum){
$addEnumFn($enum);
}
foreach($this->commandData as $commandData){ foreach($this->commandData as $commandData){
if($commandData->aliases !== null){ if($commandData->aliases !== null){
if(!isset($enumIndexes[$commandData->aliases->enumName])){ $addEnumFn($commandData->aliases);
$enums[$enumIndexes[$commandData->aliases->enumName] = count($enumIndexes)] = $commandData->aliases;
}
foreach($commandData->aliases->enumValues as $str){
$enumValueIndexes[$str] = $enumValueIndexes[$str] ?? count($enumValueIndexes); //latest index
}
} }
foreach($commandData->overloads as $overload){ foreach($commandData->overloads as $overload){
@ -422,12 +442,7 @@ class AvailableCommandsPacket extends DataPacket{
*/ */
foreach($overload as $parameter){ foreach($overload as $parameter){
if($parameter->enum !== null){ if($parameter->enum !== null){
if(!isset($enumIndexes[$parameter->enum->enumName])){ $addEnumFn($parameter->enum);
$enums[$enumIndexes[$parameter->enum->enumName] = count($enumIndexes)] = $parameter->enum;
}
foreach($parameter->enum->enumValues as $str){
$enumValueIndexes[$str] = $enumValueIndexes[$str] ?? count($enumValueIndexes);
}
} }
if($parameter->postfix !== null){ if($parameter->postfix !== null){