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

PluginBase: clean up inconsistent getter vs property access usages

Browse Source
This commit is contained in:
Dylan K. Taylor 2023-11-14 12:59:38 +00:00
parent e5c96faa4b
commit 13f34a500c
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugin/PluginBase.php
View File

@ -70,7 +70,7 @@ abstract class PluginBase implements Plugin, CommandExecutor{
$this->configFile = Path::join($this->dataFolder, "config.yml"); $this->configFile = Path::join($this->dataFolder, "config.yml");
$prefix = $this->getDescription()->getPrefix(); $prefix = $this->description->getPrefix();
$this->logger = new PluginLogger($server->getLogger(), $prefix !== "" ? $prefix : $this->getName()); $this->logger = new PluginLogger($server->getLogger(), $prefix !== "" ? $prefix : $this->getName());
$this->scheduler = new TaskScheduler($this->getFullName()); $this->scheduler = new TaskScheduler($this->getFullName());
@ -145,14 +145,14 @@ abstract class PluginBase implements Plugin, CommandExecutor{
private function registerYamlCommands() : void{ private function registerYamlCommands() : void{
$pluginCmds = []; $pluginCmds = [];
foreach(Utils::stringifyKeys($this->getDescription()->getCommands()) as $key => $data){ foreach(Utils::stringifyKeys($this->description->getCommands()) as $key => $data){
if(str_contains($key, ":")){ if(str_contains($key, ":")){
$this->logger->error($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_commandError($key, $this->getDescription()->getFullName(), ":"))); $this->logger->error($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_commandError($key, $this->description->getFullName(), ":")));
continue; continue;
} }
$newCmd = new PluginCommand($key, $this, $this); $newCmd = new PluginCommand($key, $this, $this);
if(($description = $data->getDescription()) !== null){ if(($description = $data->description) !== null){
$newCmd->setDescription($description); $newCmd->setDescription($description);
} }
@ -163,7 +163,7 @@ abstract class PluginBase implements Plugin, CommandExecutor{
$aliasList = []; $aliasList = [];
foreach($data->getAliases() as $alias){ foreach($data->getAliases() as $alias){
if(str_contains($alias, ":")){ if(str_contains($alias, ":")){
$this->logger->error($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_aliasError($alias, $this->getDescription()->getFullName(), ":"))); $this->logger->error($this->server->getLanguage()->translate(KnownTranslationFactory::pocketmine_plugin_aliasError($alias, $this->description->getFullName(), ":")));
continue; continue;
} }
$aliasList[] = $alias; $aliasList[] = $alias;
@ -181,7 +181,7 @@ abstract class PluginBase implements Plugin, CommandExecutor{
} }
if(count($pluginCmds) > 0){ if(count($pluginCmds) > 0){
$this->server->getCommandMap()->registerAll($this->getDescription()->getName(), $pluginCmds); $this->server->getCommandMap()->registerAll($this->description->getName(), $pluginCmds);
} }
} }
@ -190,9 +190,9 @@ abstract class PluginBase implements Plugin, CommandExecutor{
* @phpstan-return (Command&PluginOwned)|null * @phpstan-return (Command&PluginOwned)|null
*/ */
public function getCommand(string $name){ public function getCommand(string $name){
$command = $this->getServer()->getPluginCommand($name); $command = $this->server->getPluginCommand($name);
if($command === null || $command->getOwningPlugin() !== $this){ if($command === null || $command->getOwningPlugin() !== $this){
$command = $this->getServer()->getPluginCommand(strtolower($this->description->getName()) . ":" . $name); $command = $this->server->getPluginCommand(strtolower($this->description->getName()) . ":" . $name);
} }
if($command instanceof PluginOwned && $command->getOwningPlugin() === $this){ if($command instanceof PluginOwned && $command->getOwningPlugin() === $this){