From 96541763f1b4beff7a38d03f114a35133ada07ab Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Wed, 1 Jul 2020 13:06:59 +0100
Subject: [PATCH] ConsoleCommandSender: inject Language via constructor

---
 src/Server.php                       | 2 +-
 src/command/ConsoleCommandSender.php | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Server.php b/src/Server.php
index 89b06da5c..bc0caeff1 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -1059,7 +1059,7 @@ class Server{
 			$this->logger->info($this->getLanguage()->translateString("pocketmine.server.startFinished", [round(microtime(true) - $this->startTime, 3)]));
 
 			//TODO: move console parts to a separate component
-			$consoleSender = new ConsoleCommandSender($this);
+			$consoleSender = new ConsoleCommandSender($this, $this->language);
 			PermissionManager::getInstance()->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $consoleSender);
 			PermissionManager::getInstance()->subscribeToPermission(Server::BROADCAST_CHANNEL_USERS, $consoleSender);
 
diff --git a/src/command/ConsoleCommandSender.php b/src/command/ConsoleCommandSender.php
index df7977716..4a803a045 100644
--- a/src/command/ConsoleCommandSender.php
+++ b/src/command/ConsoleCommandSender.php
@@ -39,10 +39,13 @@ class ConsoleCommandSender implements CommandSender{
 	private $server;
 	/** @var int|null */
 	protected $lineHeight = null;
+	/** @var Language */
+	private $language;
 
-	public function __construct(Server $server){
+	public function __construct(Server $server, Language $language){
 		$this->server = $server;
 		$this->perm = new PermissibleBase($this);
+		$this->language = $language;
 	}
 
 	public function getServer() : Server{
@@ -50,7 +53,7 @@ class ConsoleCommandSender implements CommandSender{
 	}
 
 	public function getLanguage() : Language{
-		return $this->server->getLanguage();
+		return $this->language;
 	}
 
 	/**