mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-04-22 00:33:59 +00:00
Merge branch 'stable'
# Conflicts: # resources/vanilla
This commit is contained in:
commit
d9c3ec5f91
@ -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;
|
||||
}
|
||||
}
|
||||
|
@ -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;
|
||||
|
@ -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)
|
||||
];
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user