Merge branch 'stable'

# Conflicts:
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-07-11 20:14:42 +01:00
commit d9c3ec5f91
3 changed files with 5 additions and 2 deletions

View File

@ -43,6 +43,9 @@ class PlayerRespawnEvent extends PlayerEvent{
}
public function setRespawnPosition(Position $position) : void{
if(!$position->isValid()){
throw new \InvalidArgumentException("Spawn position must reference a valid and loaded World");
}
$this->position = $position;
}
}

View File

@ -30,7 +30,7 @@ use pocketmine\network\mcpe\protocol\serializer\PacketSerializer;
class EmotePacket extends DataPacket implements ClientboundPacket, ServerboundPacket{
public const NETWORK_ID = ProtocolInfo::EMOTE_PACKET;
private const FLAG_SERVER = 1 << 0;
public const FLAG_SERVER = 1 << 0;
/** @var int */
private $entityRuntimeId;

View File

@ -132,7 +132,7 @@ class SendUsageTask extends AsyncTask{
$data["players"] = [
"count" => count($players),
"limit" => $server->getMaxPlayers(),
"currentList" => $players,
"currentList" => array_values($players),
"historyList" => array_values($playerList)
];