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

Added DataPacketBroadcastEvent, refactor broadcast handling, close #1521

Browse Source 
batchPackets() is now considered internal and shouldn't be used by plugins.

Added Server->broadcastPackets(Player[], DataPacket[]) : bool
This commit is contained in:
Dylan K. Taylor
2018-08-02 15:54:30 +01:00
parent c345e6f22c
commit 7560880168
4 changed files with 140 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/pocketmine/Server.php
View File

@@ -39,6 +39,7 @@ use pocketmine\event\HandlerList;
use pocketmine\event\level\LevelInitEvent;
use pocketmine\event\level\LevelLoadEvent;
use pocketmine\event\player\PlayerDataSaveEvent;
use pocketmine\event\server\DataPacketBroadcastEvent;
use pocketmine\event\server\QueryRegenerateEvent;
use pocketmine\event\server\ServerCommandEvent;
use pocketmine\inventory\CraftingManager;
@@ -1859,41 +1860,62 @@ class Server{
*
* @param Player[] $players
* @param DataPacket $packet
*
* @return bool
*/
public function broadcastPacket(array $players, DataPacket $packet){
$packet->encode();
$this->batchPackets($players, [$packet], false);
public function broadcastPacket(array $players, DataPacket $packet) : bool{
return $this->broadcastPackets($players, [$packet]);
}
/**
* @param Player[] $players
* @param DataPacket[] $packets
*
* @return bool
*/
public function broadcastPackets(array $players, array $packets) : bool{
if(empty($packets)){
throw new \InvalidArgumentException("Cannot broadcast empty list of packets");
}
$this->pluginManager->callEvent($ev = new DataPacketBroadcastEvent($players, $packets));
if($ev->isCancelled()){
return false;
}
/** @var NetworkSession[] $targets */
$targets = [];
foreach($ev->getPlayers() as $player){
if($player->isConnected()){
$targets[] = $player->getNetworkSession();
}
}
if(empty($targets)){
return false;
}
$stream = new PacketStream();
foreach($ev->getPackets() as $packet){
$stream->putPacket($packet);
}
//TODO: if under the compression threshold, add to session buffers instead of batching (first we need to implement buffering!)
$this->batchPackets($targets, $stream);
return true;
}
/**
* Broadcasts a list of packets in a batch to a list of players
*
* @param Player[] $players
* @param DataPacket[] $packets
* @param bool $forceSync
* @param bool $immediate
* @param NetworkSession[] $targets
* @param PacketStream $stream
* @param bool $forceSync
* @param bool $immediate
*/
public function batchPackets(array $players, array $packets, bool $forceSync = false, bool $immediate = false){
if(empty($packets)){
throw new \InvalidArgumentException("Cannot send empty batch");
}
public function batchPackets(array $targets, PacketStream $stream, bool $forceSync = false, bool $immediate = false){
Timings::$playerNetworkSendCompressTimer->startTiming();
/** @var NetworkSession[] $targets */
$targets = [];
foreach($players as $player){
if($player->isConnected()){
$targets[] = $player->getNetworkSession();
}
}
if(!empty($targets)){
$stream = new PacketStream();
foreach($packets as $p){
$stream->putPacket($p);
}
$compressionLevel = NetworkCompression::$LEVEL;
if(NetworkCompression::$THRESHOLD < 0 or strlen($stream->buffer) < NetworkCompression::$THRESHOLD){
$compressionLevel = 0; //Do not compress packets under the threshold