Register MainLogger as SPL global, remove hard MainLogger dependency from many areas, break a bunch of cyclic dependencies

This commit is contained in:
Dylan K. Taylor
2018-11-05 19:01:59 +00:00
parent ed8569a3f4
commit 67a5f3f557
12 changed files with 52 additions and 136 deletions

View File

@ -24,7 +24,6 @@ declare(strict_types=1);
namespace pocketmine\permission;
use pocketmine\Server;
use pocketmine\utils\MainLogger;
class BanList{
@ -153,7 +152,7 @@ class BanList{
$this->list[$entry->getName()] = $entry;
}
}catch(\Throwable $e){
$logger = MainLogger::getLogger();
$logger = \GlobalLogger::get();
$logger->critical("Failed to parse ban entry from string \"$line\": " . $e->getMessage());
$logger->logException($e);
}
@ -161,7 +160,7 @@ class BanList{
}
fclose($fp);
}else{
MainLogger::getLogger()->error("Could not load ban list");
\GlobalLogger::get()->error("Could not load ban list");
}
}
@ -182,7 +181,7 @@ class BanList{
}
fclose($fp);
}else{
MainLogger::getLogger()->error("Could not save ban list");
\GlobalLogger::get()->error("Could not save ban list");
}
}
}