mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-14 17:59:41 +00:00
Code Issues Projects Releases Wiki Activity

ConsoleCommandSender: inject Language via constructor

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-07-01 13:06:59 +01:00
parent 7f81507ea1
commit 96541763f1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Server.php
View File

@ -1059,7 +1059,7 @@ class Server{
$this->logger->info($this->getLanguage()->translateString("pocketmine.server.startFinished", [round(microtime(true) - $this->startTime, 3)])); $this->logger->info($this->getLanguage()->translateString("pocketmine.server.startFinished", [round(microtime(true) - $this->startTime, 3)]));
//TODO: move console parts to a separate component //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_ADMINISTRATIVE, $consoleSender);
PermissionManager::getInstance()->subscribeToPermission(Server::BROADCAST_CHANNEL_USERS, $consoleSender); PermissionManager::getInstance()->subscribeToPermission(Server::BROADCAST_CHANNEL_USERS, $consoleSender);

7
src/command/ConsoleCommandSender.php
View File

@ -39,10 +39,13 @@ class ConsoleCommandSender implements CommandSender{
private $server; private $server;
/** @var int|null */ /** @var int|null */
protected $lineHeight = null; protected $lineHeight = null;
/** @var Language */
private $language;
public function __construct(Server $server){ public function __construct(Server $server, Language $language){
$this->server = $server; $this->server = $server;
$this->perm = new PermissibleBase($this); $this->perm = new PermissibleBase($this);
$this->language = $language;
} }
public function getServer() : Server{ public function getServer() : Server{
@ -50,7 +53,7 @@ class ConsoleCommandSender implements CommandSender{
} }
public function getLanguage() : Language{ public function getLanguage() : Language{
return $this->server->getLanguage(); return $this->language;
} }
/** /**