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

fixed command arg types

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-09-10 13:56:13 +01:00
parent 16cb75ef38
commit 8d0b881762
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,16 +46,16 @@ class AvailableCommandsPacket extends DataPacket{
const ARG_TYPE_VALUE = 0x03;
const ARG_TYPE_TARGET = 0x04;
const ARG_TYPE_STRING = 0x0c;
const ARG_TYPE_POSITION = 0x0d;
const ARG_TYPE_STRING = 0x0d;
const ARG_TYPE_POSITION = 0x0e;
const ARG_TYPE_RAWTEXT = 0x10;
const ARG_TYPE_RAWTEXT = 0x11;
const ARG_TYPE_TEXT = 0x12;
const ARG_TYPE_TEXT = 0x13;
const ARG_TYPE_JSON = 0x15;
const ARG_TYPE_JSON = 0x16;
const ARG_TYPE_COMMAND = 0x1c;
const ARG_TYPE_COMMAND = 0x1d;
/**
* Enums are a little different: they are composed as follows:
@ -162,14 +162,14 @@ class AvailableCommandsPacket extends DataPacket{
$retval["overloads"][$i]["params"][$j]["enum"] = null;
}
}
$retval["overloads"][$i]["params"][$j]["paramTypeString"] = self::argTypeToString($type);
$retval["overloads"][$i]["params"][$j]["paramTypeString"] = $this->argTypeToString($type);
}
}
return $retval;
}
private static function argTypeToString(int $argtype) : string{
private function argTypeToString(int $argtype) : string{
if($argtype & self::ARG_FLAG_VALID){
if($argtype & self::ARG_FLAG_ENUM){
return "stringenum (" . ($argtype & 0xffff) . ")";
@ -197,8 +197,13 @@ class AvailableCommandsPacket extends DataPacket{
case self::ARG_TYPE_COMMAND:
return "command";
}
}elseif($argtype === self::ARG_FLAG_POSTFIX){
return "special int";
}elseif($argtype !== 0){
//guessed
$baseType = $argtype >> 24;
$typeName = $this->argTypeToString(self::ARG_FLAG_VALID | $baseType);
$postfix = $this->postfixes[$argtype & 0xffff];
return $typeName . " (postfix $postfix)";
}
return "unknown ($argtype)";