mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-01 23:59:53 +00:00
Code Issues Projects Releases Wiki Activity

Eliminate more hard dependencies on MainLogger

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-06-04 16:52:03 +01:00
parent 35eaf38ca1
commit dce8ed9dd1
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/Server.php
View File

@ -1637,7 +1637,7 @@ class Server{
$this->craftingManager = new CraftingManager(); $this->craftingManager = new CraftingManager();
$this->resourceManager = new ResourcePackManager($this->getDataPath() . "resource_packs" . DIRECTORY_SEPARATOR); $this->resourceManager = new ResourcePackManager($this->getDataPath() . "resource_packs" . DIRECTORY_SEPARATOR, $this->logger);
$this->pluginManager = new PluginManager($this, $this->commandMap); $this->pluginManager = new PluginManager($this, $this->commandMap);
$this->pluginManager->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this->consoleSender); $this->pluginManager->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this->consoleSender);

3
src/pocketmine/plugin/PluginManager.php
View File

@ -35,7 +35,6 @@ use pocketmine\permission\Permission;
use pocketmine\Server; use pocketmine\Server;
use pocketmine\timings\Timings; use pocketmine\timings\Timings;
use pocketmine\timings\TimingsHandler; use pocketmine\timings\TimingsHandler;
use pocketmine\utils\MainLogger;
use pocketmine\utils\Utils; use pocketmine\utils\Utils;
/** /**
@ -759,7 +758,7 @@ class PluginManager{
$isHandler = count($parameters) === 1 && $parameters[0]->getClass() instanceof \ReflectionClass && is_subclass_of($parameters[0]->getClass()->getName(), Event::class); $isHandler = count($parameters) === 1 && $parameters[0]->getClass() instanceof \ReflectionClass && is_subclass_of($parameters[0]->getClass()->getName(), Event::class);
}catch(\ReflectionException $e){ }catch(\ReflectionException $e){
if(isset($tags["softDepend"]) && !isset($this->plugins[$tags["softDepend"]])){ if(isset($tags["softDepend"]) && !isset($this->plugins[$tags["softDepend"]])){
MainLogger::getLogger()->debug("Not registering @softDepend listener " . get_class($listener) . "::" . $method->getName() . "(" . $parameters[0]->getType()->getName() . ") because plugin \"" . $tags["softDepend"] . "\" not found"); $this->server->getLogger()->debug("Not registering @softDepend listener " . get_class($listener) . "::" . $method->getName() . "(" . $parameters[0]->getType()->getName() . ") because plugin \"" . $tags["softDepend"] . "\" not found");
continue; continue;
} }

8
src/pocketmine/resourcepacks/ResourcePackManager.php
View File

@ -25,7 +25,6 @@ declare(strict_types=1);
namespace pocketmine\resourcepacks; namespace pocketmine\resourcepacks;
use pocketmine\utils\Config; use pocketmine\utils\Config;
use pocketmine\utils\MainLogger;
class ResourcePackManager{ class ResourcePackManager{
@ -42,13 +41,12 @@ class ResourcePackManager{
private $uuidList = []; private $uuidList = [];
/** /**
* @param string $path Path to resource-packs directory. * @param string $path Path to resource-packs directory.
* @param \Logger $logger
*/ */
public function __construct(string $path){ public function __construct(string $path, \Logger $logger){
$this->path = $path; $this->path = $path;
$logger = MainLogger::getLogger();
if(!file_exists($this->path)){ if(!file_exists($this->path)){
$logger->debug("Resource packs path $path does not exist, creating directory"); $logger->debug("Resource packs path $path does not exist, creating directory");
mkdir($this->path); mkdir($this->path);