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

ConsoleCommandSender: be honest about Server dependency

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-05-23 12:31:22 +01:00
parent 5f2e65d608
commit 5eadb0ac44
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

@ -1113,7 +1113,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();
$consoleSender = new ConsoleCommandSender($this);
PermissionManager::getInstance()->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $consoleSender);
PermissionManager::getInstance()->subscribeToPermission(Server::BROADCAST_CHANNEL_USERS, $consoleSender);

7
src/command/ConsoleCommandSender.php
View File

@ -34,15 +34,18 @@ use const PHP_INT_MAX;
class ConsoleCommandSender implements CommandSender{
use PermissibleDelegateTrait;
/** @var Server */
private $server;
/** @var int|null */
protected $lineHeight = null;
public function __construct(){
public function __construct(Server $server){
$this->server = $server;
$this->perm = new PermissibleBase($this);
}
public function getServer() : Server{
return Server::getInstance();
return $this->server;
}
/**