mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-15 18:29:46 +00:00
Code Issues Projects Releases Wiki Activity

Server: drop redundant proxy function broadcastPacket()

Browse Source 
this is just making it harder to search for broadcast usages, and we want to get rid of all packet broadcasting shit from Server anyway.
This commit is contained in:
Dylan K. Taylor 2019-08-19 19:30:57 +01:00
parent 8557c93f04
commit 965177fb74
6 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Server.php
View File

@ -1419,18 +1419,6 @@ class Server{
return count($recipients);
}
/**
* Broadcasts a Minecraft packet to a list of players
*
* @param Player[] $players
* @param ClientboundPacket $packet
*
* @return bool
*/
public function broadcastPacket(array $players, ClientboundPacket $packet) : bool{
return $this->broadcastPackets($players, [$packet]);
}
/**
* @param Player[] $players
* @param ClientboundPacket[] $packets

4
src/entity/Entity.php
View File

@ -1804,11 +1804,11 @@ abstract class Entity{
}
public function broadcastEntityEvent(int $eventId, ?int $eventData = null, ?array $players = null) : void{
$this->server->broadcastPacket($players ?? $this->getViewers(), ActorEventPacket::create($this->id, $eventId, $eventData ?? 0));
$this->server->broadcastPackets($players ?? $this->getViewers(), [ActorEventPacket::create($this->id, $eventId, $eventData ?? 0)]);
}
public function broadcastAnimation(?array $players, int $animationId) : void{
$this->server->broadcastPacket($players ?? $this->getViewers(), AnimatePacket::create($this->id, $animationId));
$this->server->broadcastPackets($players ?? $this->getViewers(), [AnimatePacket::create($this->id, $animationId)]);
}
public function __destruct(){

2
src/entity/Human.php
View File

@ -155,7 +155,7 @@ class Human extends Living implements ProjectileSource, InventoryHolder{
$pk = new PlayerSkinPacket();
$pk->uuid = $this->getUniqueId();
$pk->skin = $this->skin;
$this->server->broadcastPacket($targets ?? $this->hasSpawned, $pk);
$this->server->broadcastPackets($targets ?? $this->hasSpawned, [$pk]);
}
public function jump() : void{

2
src/entity/object/ItemEntity.php
View File

@ -261,7 +261,7 @@ class ItemEntity extends Entity{
return;
}
$this->server->broadcastPacket($this->getViewers(), TakeItemActorPacket::create($player->getId(), $this->getId()));
$this->server->broadcastPackets($this->getViewers(), [TakeItemActorPacket::create($player->getId(), $this->getId())]);
$playerInventory->addItem(clone $item);
$this->flagForDespawn();

2
src/entity/projectile/Arrow.php
View File

@ -197,7 +197,7 @@ class Arrow extends Projectile{
return;
}
$this->server->broadcastPacket($this->getViewers(), TakeItemActorPacket::create($player->getId(), $this->getId()));
$this->server->broadcastPackets($this->getViewers(), [TakeItemActorPacket::create($player->getId(), $this->getId())]);
$playerInventory->addItem(clone $item);
$this->flagForDespawn();

4
src/world/World.php
View File

@ -697,7 +697,7 @@ class World implements ChunkManager{
if(empty($targets)){
$this->broadcastGlobalPacket($pk);
}else{
$this->server->broadcastPacket($targets, $pk);
$this->server->broadcastPackets($targets, [$pk]);
}
}
@ -2680,7 +2680,7 @@ class World implements ChunkManager{
if(empty($targets)){
$this->broadcastGlobalPacket($pk);
}else{
$this->server->broadcastPacket($targets, $pk);
$this->server->broadcastPackets($targets, [$pk]);
}
}