mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-09 11:16:57 +00:00
Code Issues Projects Releases Wiki Activity

Replace disallowed operators in src/plugin/

Browse Source
This commit is contained in:
Dylan K. Taylor
2022-01-20 19:19:20 +00:00
parent 3f8f5cd200
commit 03f47d0a78
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugin/PluginManager.php
View File

@ -137,7 +137,7 @@ class PluginManager{
$this->server->getLogger()->info($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_load($description->getFullName())));
$dataFolder = $this->getDataDirectory($path, $description->getName());
if(file_exists($dataFolder) and !is_dir($dataFolder)){
if(file_exists($dataFolder) && !is_dir($dataFolder)){
$this->server->getLogger()->error($language->translate(KnownTranslationFactory::pocketmine_plugin_loadError(
$description->getName(),
KnownTranslationFactory::pocketmine_plugin_badDataFolder($dataFolder)
@ -274,7 +274,7 @@ class PluginManager{
continue;
}
if(isset($triage->plugins[$name]) or $this->getPlugin($name) instanceof Plugin){
if(isset($triage->plugins[$name]) || $this->getPlugin($name) instanceof Plugin){
$this->server->getLogger()->error($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_duplicateError($name)));
continue;
}
@ -283,7 +283,7 @@ class PluginManager{
$this->server->getLogger()->warning($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_spacesDiscouraged($name)));
}
if($this->graylist !== null and !$this->graylist->isAllowed($name)){
if($this->graylist !== null && !$this->graylist->isAllowed($name)){
$this->server->getLogger()->notice($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_loadError(
$name,
$this->graylist->isWhitelist() ? KnownTranslationFactory::pocketmine_plugin_disallowedByWhitelist() : KnownTranslationFactory::pocketmine_plugin_disallowedByBlacklist()
@ -314,7 +314,7 @@ class PluginManager{
private function checkDepsForTriage(string $pluginName, string $dependencyType, array &$dependencyLists, array $loadedPlugins, PluginLoadTriage $triage) : void{
if(isset($dependencyLists[$pluginName])){
foreach($dependencyLists[$pluginName] as $key => $dependency){
if(isset($loadedPlugins[$dependency]) or $this->getPlugin($dependency) instanceof Plugin){
if(isset($loadedPlugins[$dependency]) || $this->getPlugin($dependency) instanceof Plugin){
$this->server->getLogger()->debug("Successfully resolved $dependencyType dependency \"$dependency\" for plugin \"$pluginName\"");
unset($dependencyLists[$pluginName][$key]);
}elseif(array_key_exists($dependency, $triage->plugins)){
@ -348,7 +348,7 @@ class PluginManager{
$this->checkDepsForTriage($name, "hard", $triage->dependencies, $loadedPlugins, $triage);
$this->checkDepsForTriage($name, "soft", $triage->softDependencies, $loadedPlugins, $triage);
if(!isset($triage->dependencies[$name]) and !isset($triage->softDependencies[$name])){
if(!isset($triage->dependencies[$name]) && !isset($triage->softDependencies[$name])){
unset($triage->plugins[$name]);
$loadedThisLoop++;
@ -426,7 +426,7 @@ class PluginManager{
}
public function isPluginEnabled(Plugin $plugin) : bool{
return isset($this->plugins[$plugin->getDescription()->getName()]) and $plugin->isEnabled();
return isset($this->plugins[$plugin->getDescription()->getName()]) && $plugin->isEnabled();
}
public function enablePlugin(Plugin $plugin) : void{
@ -485,7 +485,7 @@ class PluginManager{
* @phpstan-return class-string<Event>|null
*/
private function getEventsHandledBy(\ReflectionMethod $method) : ?string{
if($method->isStatic() or !$method->getDeclaringClass()->implementsInterface(Listener::class)){
if($method->isStatic() || !$method->getDeclaringClass()->implementsInterface(Listener::class)){
return null;
}
$tags = Utils::parseDocComment((string) $method->getDocComment());