From 5aea9220c9e8d365d6356e780acd0327e30bccb9 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Sun, 4 Jun 2017 10:27:04 +0100
Subject: [PATCH] Fixed chat and some TextContainer documentation issues

---
 src/pocketmine/Player.php                        | 2 +-
 src/pocketmine/Server.php                        | 8 ++++----
 src/pocketmine/command/CommandSender.php         | 3 ++-
 src/pocketmine/command/ConsoleCommandSender.php  | 2 +-
 src/pocketmine/event/player/PlayerDeathEvent.php | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 139239600..8301b5e2e 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -3566,7 +3566,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
 	/**
 	 * Sends a direct chat message to a player
 	 *
-	 * @param string|TextContainer $message
+	 * @param TextContainer|string $message
 	 */
 	public function sendMessage($message){
 		if($message instanceof TextContainer){
diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php
index 0a0c30ae0..537f9ff47 100644
--- a/src/pocketmine/Server.php
+++ b/src/pocketmine/Server.php
@@ -1660,7 +1660,7 @@ class Server{
 	 *
 	 * @return int
 	 */
-	public function broadcastMessage($message, array $recipients = []) : int{
+	public function broadcastMessage($message, array $recipients = null) : int{
 		if(!is_array($recipients)){
 			return $this->broadcast($message, self::BROADCAST_CHANNEL_USERS);
 		}
@@ -1755,12 +1755,12 @@ class Server{
 	}
 
 	/**
-	 * @param string $message
-	 * @param string $permissions
+	 * @param TextContainer|string $message
+	 * @param string               $permissions
 	 *
 	 * @return int
 	 */
-	public function broadcast(string $message, string $permissions) : int{
+	public function broadcast($message, string $permissions) : int{
 		/** @var CommandSender[] $recipients */
 		$recipients = [];
 		foreach(explode(";", $permissions) as $permission){
diff --git a/src/pocketmine/command/CommandSender.php b/src/pocketmine/command/CommandSender.php
index ba42a9980..4c21bd841 100644
--- a/src/pocketmine/command/CommandSender.php
+++ b/src/pocketmine/command/CommandSender.php
@@ -23,12 +23,13 @@ declare(strict_types=1);
 
 namespace pocketmine\command;
 
+use pocketmine\event\TextContainer;
 use pocketmine\permission\Permissible;
 
 interface CommandSender extends Permissible{
 
 	/**
-	 * @param string $message
+	 * @param TextContainer|string $message
 	 */
 	public function sendMessage($message);
 
diff --git a/src/pocketmine/command/ConsoleCommandSender.php b/src/pocketmine/command/ConsoleCommandSender.php
index 7f7267c1f..5f9afa1d5 100644
--- a/src/pocketmine/command/ConsoleCommandSender.php
+++ b/src/pocketmine/command/ConsoleCommandSender.php
@@ -102,7 +102,7 @@ class ConsoleCommandSender implements CommandSender{
 	}
 
 	/**
-	 * @param string $message
+	 * @param TextContainer|string $message
 	 */
 	public function sendMessage($message){
 		if($message instanceof TextContainer){
diff --git a/src/pocketmine/event/player/PlayerDeathEvent.php b/src/pocketmine/event/player/PlayerDeathEvent.php
index 37d2b999d..faf8de63d 100644
--- a/src/pocketmine/event/player/PlayerDeathEvent.php
+++ b/src/pocketmine/event/player/PlayerDeathEvent.php
@@ -67,7 +67,7 @@ class PlayerDeathEvent extends EntityDeathEvent{
 	}
 
 	/**
-	 * @param string|TextContainer $deathMessage
+	 * @param TextContainer|string $deathMessage
 	 */
 	public function setDeathMessage($deathMessage){
 		$this->deathMessage = $deathMessage;