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

move PlayerListPacket sending responsibility to NetworkSession

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-06-04 18:02:36 +01:00
parent 89d4f596bd
commit 6f29fe063f
4 changed files with 35 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/pocketmine/network/mcpe/NetworkSession.php
View File

@ -55,6 +55,7 @@ use pocketmine\network\mcpe\protocol\ModalFormRequestPacket;
use pocketmine\network\mcpe\protocol\MovePlayerPacket;
use pocketmine\network\mcpe\protocol\NetworkChunkPublisherUpdatePacket;
use pocketmine\network\mcpe\protocol\Packet;
use pocketmine\network\mcpe\protocol\PlayerListPacket;
use pocketmine\network\mcpe\protocol\PlayStatusPacket;
use pocketmine\network\mcpe\protocol\ServerboundPacket;
use pocketmine\network\mcpe\protocol\ServerToClientHandshakePacket;
@ -66,6 +67,7 @@ use pocketmine\network\mcpe\protocol\types\CommandData;
use pocketmine\network\mcpe\protocol\types\CommandEnum;
use pocketmine\network\mcpe\protocol\types\CommandParameter;
use pocketmine\network\mcpe\protocol\types\ContainerIds;
use pocketmine\network\mcpe\protocol\types\PlayerListEntry;
use pocketmine\network\mcpe\protocol\types\PlayerPermissions;
use pocketmine\network\mcpe\protocol\UpdateAttributesPacket;
use pocketmine\network\NetworkInterface;
@ -843,6 +845,32 @@ class NetworkSession{
$this->sendDataPacket($pk);
}
public function syncPlayerList() : void{
$pk = new PlayerListPacket();
$pk->type = PlayerListPacket::TYPE_ADD;
foreach($this->server->getOnlinePlayers() as $player){
$pk->entries[] = PlayerListEntry::createAdditionEntry($player->getUniqueId(), $player->getId(), $player->getDisplayName(), $player->getSkin(), $player->getXuid());
}
$this->sendDataPacket($pk);
}
public function onPlayerAdded(Player $p) : void{
$pk = new PlayerListPacket();
$pk->type = PlayerListPacket::TYPE_ADD;
$pk->entries[] = PlayerListEntry::createAdditionEntry($p->getUniqueId(), $p->getId(), $p->getName(), $p->getSkin(), $p->getXuid());
$this->sendDataPacket($pk);
}
public function onPlayerRemoved(Player $p) : void{
if($p !== $this->player){
$pk = new PlayerListPacket();
$pk->type = PlayerListPacket::TYPE_REMOVE;
$pk->entries[] = PlayerListEntry::createRemovalEntry($p->getUniqueId());
$this->sendDataPacket($pk);
}
}
public function tick() : bool{
if($this->handler instanceof LoginSessionHandler){
if(time() >= $this->connectTime + 10){

2
src/pocketmine/network/mcpe/handler/PreSpawnSessionHandler.php
View File

@ -96,7 +96,7 @@ class PreSpawnSessionHandler extends SessionHandler{
$this->player->getInventory()->sendHeldItem($this->player);
$this->session->queueCompressed($this->server->getCraftingManager()->getCraftingDataPacket());
$this->server->sendFullPlayerListData($this->player);
$this->session->syncPlayerList();
}
public function handleRequestChunkRadius(RequestChunkRadiusPacket $packet) : bool{