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

DataPacket events now use network sessions instead of players

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-03-23 09:52:03 +00:00
parent afbd016611
commit 433dab078b
5 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/pocketmine/Server.php
View File

@ -1479,22 +1479,23 @@ class Server{
throw new \InvalidArgumentException("Cannot broadcast empty list of packets");
}
$ev = new DataPacketBroadcastEvent($players, $packets);
/** @var NetworkSession[] $recipients */
$recipients = [];
foreach($players as $player){
if($player->isConnected()){
$recipients[] = $player->getNetworkSession();
}
}
if(empty($recipients)){
return false;
}
$ev = new DataPacketBroadcastEvent($recipients, $packets);
$ev->call();
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;
}
$recipients = $ev->getTargets();
$stream = new PacketStream();
foreach($ev->getPackets() as $packet){
@ -1502,14 +1503,14 @@ class Server{
}
if(NetworkCompression::$THRESHOLD < 0 or strlen($stream->getBuffer()) < NetworkCompression::$THRESHOLD){
foreach($targets as $target){
foreach($recipients as $target){
foreach($ev->getPackets() as $pk){
$target->addToSendBuffer($pk);
}
}
}else{
$promise = $this->prepareBatch($stream);
foreach($targets as $target){
foreach($recipients as $target){
$target->queueCompressed($promise);
}
}