From 70b0d832583c162484458e1ef4dbc70c174ea7b4 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Sat, 28 Nov 2020 13:01:10 +0000
Subject: [PATCH] Removed Server->broadcast() this method has an explicit
 dependency on permission subscriptions, which I plan to eradicate. The
 method's functionality can be replaced using Server->broadcastMessage() with
 a custom recipients array.

---
 src/Server.php | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/Server.php b/src/Server.php
index 5288a3988..b3348c736 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -1090,7 +1090,12 @@ class Server{
 	 */
 	public function broadcastMessage($message, ?array $recipients = null) : int{
 		if(!is_array($recipients)){
-			return $this->broadcast($message, self::BROADCAST_CHANNEL_USERS);
+			$recipients = [];
+			foreach(PermissionManager::getInstance()->getPermissionSubscriptions(self::BROADCAST_CHANNEL_USERS) as $permissible){
+				if($permissible instanceof CommandSender and $permissible->hasPermission(self::BROADCAST_CHANNEL_USERS)){
+					$recipients[spl_object_id($permissible)] = $permissible; // do not send messages directly, or some might be repeated
+				}
+			}
 		}
 
 		foreach($recipients as $recipient){
@@ -1156,27 +1161,6 @@ class Server{
 		return count($recipients);
 	}
 
-	/**
-	 * @param TranslationContainer|string $message
-	 */
-	public function broadcast($message, string $permissions) : int{
-		/** @var CommandSender[] $recipients */
-		$recipients = [];
-		foreach(explode(";", $permissions) as $permission){
-			foreach(PermissionManager::getInstance()->getPermissionSubscriptions($permission) as $permissible){
-				if($permissible instanceof CommandSender and $permissible->hasPermission($permission)){
-					$recipients[spl_object_id($permissible)] = $permissible; // do not send messages directly, or some might be repeated
-				}
-			}
-		}
-
-		foreach($recipients as $recipient){
-			$recipient->sendMessage($message);
-		}
-
-		return count($recipients);
-	}
-
 	/**
 	 * @param Player[]            $players
 	 * @param ClientboundPacket[] $packets