From a653289c404cd02320ecc9c3f73a23ceb8a76841 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Mon, 8 Oct 2018 13:06:51 +0100 Subject: [PATCH] Rename Plugin->setEnabled() with a more clear name This is intended to break API in order to jerk the rug out from underneath plugin developers who have been misusing this without noticing the side effects. --- src/pocketmine/plugin/Plugin.php | 2 +- src/pocketmine/plugin/PluginBase.php | 2 +- src/pocketmine/plugin/PluginManager.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pocketmine/plugin/Plugin.php b/src/pocketmine/plugin/Plugin.php index f6df54b8e..1a6146a6b 100644 --- a/src/pocketmine/plugin/Plugin.php +++ b/src/pocketmine/plugin/Plugin.php @@ -51,7 +51,7 @@ interface Plugin extends CommandExecutor{ * * @param bool $enabled */ - public function setEnabled(bool $enabled = true) : void; + public function onEnableStateChange(bool $enabled) : void; /** * @return bool diff --git a/src/pocketmine/plugin/PluginBase.php b/src/pocketmine/plugin/PluginBase.php index fd4a91374..b76ffa2c2 100644 --- a/src/pocketmine/plugin/PluginBase.php +++ b/src/pocketmine/plugin/PluginBase.php @@ -110,7 +110,7 @@ abstract class PluginBase implements Plugin{ * * @param bool $enabled */ - final public function setEnabled(bool $enabled = true) : void{ + final public function onEnableStateChange(bool $enabled) : void{ if($this->isEnabled !== $enabled){ $this->isEnabled = $enabled; if($this->isEnabled){ diff --git a/src/pocketmine/plugin/PluginManager.php b/src/pocketmine/plugin/PluginManager.php index 847bf9f29..98f1dd960 100644 --- a/src/pocketmine/plugin/PluginManager.php +++ b/src/pocketmine/plugin/PluginManager.php @@ -412,7 +412,7 @@ class PluginManager{ $permManager->addPermission($perm); } $plugin->getScheduler()->setEnabled(true); - $plugin->setEnabled(true); + $plugin->onEnableStateChange(true); $this->enabledPlugins[$plugin->getDescription()->getName()] = $plugin; @@ -498,7 +498,7 @@ class PluginManager{ unset($this->enabledPlugins[$plugin->getDescription()->getName()]); try{ - $plugin->setEnabled(false); + $plugin->onEnableStateChange(false); }catch(\Throwable $e){ $this->server->getLogger()->logException($e); }