diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index 4fbcb4d90..00aad6e96 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -1637,7 +1637,7 @@ class Server{ $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->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this->consoleSender); diff --git a/src/pocketmine/plugin/PluginManager.php b/src/pocketmine/plugin/PluginManager.php index 7244c4113..d1a66fae3 100644 --- a/src/pocketmine/plugin/PluginManager.php +++ b/src/pocketmine/plugin/PluginManager.php @@ -35,7 +35,6 @@ use pocketmine\permission\Permission; use pocketmine\Server; use pocketmine\timings\Timings; use pocketmine\timings\TimingsHandler; -use pocketmine\utils\MainLogger; 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); }catch(\ReflectionException $e){ 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; } diff --git a/src/pocketmine/resourcepacks/ResourcePackManager.php b/src/pocketmine/resourcepacks/ResourcePackManager.php index 55a94b02e..952a0d7b6 100644 --- a/src/pocketmine/resourcepacks/ResourcePackManager.php +++ b/src/pocketmine/resourcepacks/ResourcePackManager.php @@ -25,7 +25,6 @@ declare(strict_types=1); namespace pocketmine\resourcepacks; use pocketmine\utils\Config; -use pocketmine\utils\MainLogger; class ResourcePackManager{ @@ -42,13 +41,12 @@ class ResourcePackManager{ 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; - $logger = MainLogger::getLogger(); - if(!file_exists($this->path)){ $logger->debug("Resource packs path $path does not exist, creating directory"); mkdir($this->path);