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

Removed network channels, bumped protocol

Browse Source
This commit is contained in:
Shoghi Cervantes
2015-08-12 14:59:30 +02:00
parent 8889e687c9
commit 31ef7721b1
28 changed files with 166 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/pocketmine/Server.php
View File

@ -1858,9 +1858,8 @@ class Server{
Timings::$playerNetworkTimer->stopTiming();
}
public function broadcastPacketsCallback($data, array $identifiers, $channel = 0){
public function broadcastPacketsCallback($data, array $identifiers){
$pk = new BatchPacket();
$pk->setChannel($channel);
$pk->payload = $data;
$pk->encode();
$pk->isEncoded = true;
@ -2259,7 +2258,7 @@ class Server{
$pk = new PlayerListPacket();
$pk->type = PlayerListPacket::TYPE_REMOVE;
$pk->entries[] = [$player->getUniqueId()];
Server::broadcastPacket($this->playerList, $pk->setChannel(Network::CHANNEL_ENTITY_SPAWNING));
Server::broadcastPacket($this->playerList, $pk);
}
}
@ -2267,14 +2266,14 @@ class Server{
$pk = new PlayerListPacket();
$pk->type = PlayerListPacket::TYPE_ADD;
$pk->entries[] = [$uuid, $entityId, $name, $isSlim, $skinData];
Server::broadcastPacket($players === null ? $this->playerList : $players, $pk->setChannel(Network::CHANNEL_ENTITY_SPAWNING));
Server::broadcastPacket($players === null ? $this->playerList : $players, $pk);
}
public function removePlayerListData(UUID $uuid, array $players = null){
$pk = new PlayerListPacket();
$pk->type = PlayerListPacket::TYPE_REMOVE;
$pk->entries[] = [$uuid];
Server::broadcastPacket($players === null ? $this->playerList : $players, $pk->setChannel(Network::CHANNEL_ENTITY_SPAWNING));
Server::broadcastPacket($players === null ? $this->playerList : $players, $pk);
}
public function sendFullPlayerListData(Player $p){
@ -2284,7 +2283,7 @@ class Server{
$pk->entries[] = [$player->getUniqueId(), $player->getId(), $player->getDisplayName(), $player->isSkinSlim(), $player->getSkinData()];
}
$p->dataPacket($pk->setChannel(Network::CHANNEL_ENTITY_SPAWNING));
$p->dataPacket($pk);
}
public function sendRecipeList(Player $p){
@ -2303,7 +2302,7 @@ class Server{
$pk->addFurnaceRecipe($recipe);
}
$p->dataPacket($pk->setChannel(Network::CHANNEL_WORLD_EVENTS));
$p->dataPacket($pk);
}
private function checkTickUpdates($currentTick, $tickTime){