Merge remote-tracking branch 'origin/stable'

This commit is contained in:
Dylan K. Taylor
2021-06-04 18:03:32 +01:00
4 changed files with 23 additions and 16 deletions

View File

@ -31,24 +31,24 @@ class AddEntityPacket extends DataPacket implements ClientboundPacket{
public const NETWORK_ID = ProtocolInfo::ADD_ENTITY_PACKET;
/** @var int */
private $uvarint1;
private $entityNetId;
public static function create(int $uvarint1) : self{
public static function create(int $entityNetId) : self{
$result = new self;
$result->uvarint1 = $uvarint1;
$result->entityNetId = $entityNetId;
return $result;
}
public function getUvarint1() : int{
return $this->uvarint1;
public function getEntityNetId() : int{
return $this->entityNetId;
}
protected function decodePayload(PacketSerializer $in) : void{
$this->uvarint1 = $in->getUnsignedVarInt();
$this->entityNetId = $in->getUnsignedVarInt();
}
protected function encodePayload(PacketSerializer $out) : void{
$out->putUnsignedVarInt($this->uvarint1);
$out->putUnsignedVarInt($this->entityNetId);
}
public function handle(PacketHandlerInterface $handler) : bool{

View File

@ -31,24 +31,24 @@ class RemoveEntityPacket extends DataPacket implements ClientboundPacket{
public const NETWORK_ID = ProtocolInfo::REMOVE_ENTITY_PACKET;
/** @var int */
private $uvarint1;
private $entityNetId;
public static function create(int $uvarint1) : self{
public static function create(int $entityNetId) : self{
$result = new self;
$result->uvarint1 = $uvarint1;
$result->entityNetId = $entityNetId;
return $result;
}
public function getUvarint1() : int{
return $this->uvarint1;
public function getEntityNetId() : int{
return $this->entityNetId;
}
protected function decodePayload(PacketSerializer $in) : void{
$this->uvarint1 = $in->getUnsignedVarInt();
$this->entityNetId = $in->getUnsignedVarInt();
}
protected function encodePayload(PacketSerializer $out) : void{
$out->putUnsignedVarInt($this->uvarint1);
$out->putUnsignedVarInt($this->entityNetId);
}
public function handle(PacketHandlerInterface $handler) : bool{

View File

@ -30,6 +30,13 @@ use pocketmine\network\mcpe\protocol\serializer\PacketSerializer;
class SetDisplayObjectivePacket extends DataPacket implements ClientboundPacket{
public const NETWORK_ID = ProtocolInfo::SET_DISPLAY_OBJECTIVE_PACKET;
public const DISPLAY_SLOT_LIST = "list";
public const DISPLAY_SLOT_SIDEBAR = "sidebar";
public const DISPLAY_SLOT_BELOW_NAME = "belowname";
public const SORT_ORDER_ASCENDING = 0;
public const SORT_ORDER_DESCENDING = 1;
/** @var string */
public $displaySlot;
/** @var string */