CommandParameter: change byte1 field to "flags" (#3115)

This commit is contained in:
Frago9876543210 2019-09-18 13:10:42 +03:00 committed by Dylan T
parent 1866de269b
commit ec0558597b
2 changed files with 4 additions and 4 deletions

View File

@ -239,7 +239,7 @@ class AvailableCommandsPacket extends DataPacket implements ClientboundPacket{
$parameter->paramName = $this->getString(); $parameter->paramName = $this->getString();
$parameter->paramType = $this->getLInt(); $parameter->paramType = $this->getLInt();
$parameter->isOptional = $this->getBool(); $parameter->isOptional = $this->getBool();
$parameter->byte1 = $this->getByte(); $parameter->flags = $this->getByte();
if($parameter->paramType & self::ARG_FLAG_ENUM){ if($parameter->paramType & self::ARG_FLAG_ENUM){
$index = ($parameter->paramType & 0xffff); $index = ($parameter->paramType & 0xffff);
@ -302,7 +302,7 @@ class AvailableCommandsPacket extends DataPacket implements ClientboundPacket{
$this->putLInt($type); $this->putLInt($type);
$this->putBool($parameter->isOptional); $this->putBool($parameter->isOptional);
$this->putByte($parameter->byte1); $this->putByte($parameter->flags);
} }
} }
} }

View File

@ -33,7 +33,7 @@ class CommandParameter{
/** @var bool */ /** @var bool */
public $isOptional; public $isOptional;
/** @var int */ /** @var int */
public $byte1 = 0; //unknown, always zero except for in /gamerule command public $flags = 0; //shows enum name if 1, always zero except for in /gamerule command
/** @var CommandEnum|null */ /** @var CommandEnum|null */
public $enum; public $enum;
/** @var string|null */ /** @var string|null */
@ -60,7 +60,7 @@ class CommandParameter{
public static function enum(string $name, CommandEnum $enum, int $flags, bool $optional = false) : self{ public static function enum(string $name, CommandEnum $enum, int $flags, bool $optional = false) : self{
$result = self::baseline($name, AvailableCommandsPacket::ARG_FLAG_ENUM | AvailableCommandsPacket::ARG_FLAG_VALID, $optional); $result = self::baseline($name, AvailableCommandsPacket::ARG_FLAG_ENUM | AvailableCommandsPacket::ARG_FLAG_VALID, $optional);
$result->enum = $enum; $result->enum = $enum;
$result->byte1 = $flags; $result->flags = $flags;
return $result; return $result;
} }
} }