From 965177fb743485c9d82342e563925376830d876b Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Mon, 19 Aug 2019 19:30:57 +0100
Subject: [PATCH] Server: drop redundant proxy function broadcastPacket()

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.
---
 src/Server.php                   | 12 ------------
 src/entity/Entity.php            |  4 ++--
 src/entity/Human.php             |  2 +-
 src/entity/object/ItemEntity.php |  2 +-
 src/entity/projectile/Arrow.php  |  2 +-
 src/world/World.php              |  4 ++--
 6 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/Server.php b/src/Server.php
index f70a77485..aebf14bb3 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -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
diff --git a/src/entity/Entity.php b/src/entity/Entity.php
index d2e54ed58..47c6f95bc 100644
--- a/src/entity/Entity.php
+++ b/src/entity/Entity.php
@@ -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(){
diff --git a/src/entity/Human.php b/src/entity/Human.php
index 8a7eca6e3..203a85b6b 100644
--- a/src/entity/Human.php
+++ b/src/entity/Human.php
@@ -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{
diff --git a/src/entity/object/ItemEntity.php b/src/entity/object/ItemEntity.php
index 2cda0ca32..354819eec 100644
--- a/src/entity/object/ItemEntity.php
+++ b/src/entity/object/ItemEntity.php
@@ -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();
diff --git a/src/entity/projectile/Arrow.php b/src/entity/projectile/Arrow.php
index 01478eacd..f5bfeeabf 100644
--- a/src/entity/projectile/Arrow.php
+++ b/src/entity/projectile/Arrow.php
@@ -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();
diff --git a/src/world/World.php b/src/world/World.php
index 4227b6ad7..b801a3cd5 100644
--- a/src/world/World.php
+++ b/src/world/World.php
@@ -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]);
 		}
 	}