diff --git a/src/Server.php b/src/Server.php index b517bf150..97c438e15 100644 --- a/src/Server.php +++ b/src/Server.php @@ -69,7 +69,7 @@ use pocketmine\player\Player; use pocketmine\plugin\PharPluginLoader; use pocketmine\plugin\Plugin; use pocketmine\plugin\PluginGraylist; -use pocketmine\plugin\PluginLoadOrder; +use pocketmine\plugin\PluginEnableOrder; use pocketmine\plugin\PluginManager; use pocketmine\plugin\PluginOwned; use pocketmine\plugin\ScriptPluginLoader; @@ -976,7 +976,7 @@ class Server{ register_shutdown_function([$this, "crashDump"]); $this->pluginManager->loadPlugins($this->pluginPath); - $this->enablePlugins(PluginLoadOrder::STARTUP()); + $this->enablePlugins(PluginEnableOrder::STARTUP()); foreach((array) $this->configGroup->getProperty("worlds", []) as $name => $options){ if($options === null){ @@ -1025,7 +1025,7 @@ class Server{ $this->worldManager->setDefaultWorld($world); } - $this->enablePlugins(PluginLoadOrder::POSTWORLD()); + $this->enablePlugins(PluginEnableOrder::POSTWORLD()); $this->network->registerInterface(new RakLibInterface($this)); $this->logger->info($this->getLanguage()->translateString("pocketmine.server.networkStart", [$this->getIp(), $this->getPort()])); @@ -1258,14 +1258,14 @@ class Server{ } } - public function enablePlugins(PluginLoadOrder $type) : void{ + public function enablePlugins(PluginEnableOrder $type) : void{ foreach($this->pluginManager->getPlugins() as $plugin){ if(!$plugin->isEnabled() and $plugin->getDescription()->getOrder()->equals($type)){ $this->pluginManager->enablePlugin($plugin); } } - if($type->equals(PluginLoadOrder::POSTWORLD())){ + if($type->equals(PluginEnableOrder::POSTWORLD())){ $this->commandMap->registerServerAliases(); } } diff --git a/src/plugin/PluginDescription.php b/src/plugin/PluginDescription.php index e0632eae2..ad56adaaf 100644 --- a/src/plugin/PluginDescription.php +++ b/src/plugin/PluginDescription.php @@ -80,7 +80,7 @@ class PluginDescription{ private $website = ""; /** @var string */ private $prefix = ""; - /** @var PluginLoadOrder */ + /** @var PluginEnableOrder */ private $order; /** @var Permission[] */ @@ -146,12 +146,12 @@ class PluginDescription{ if(isset($plugin["load"])){ try{ - $this->order = PluginLoadOrder::fromString($plugin["load"]); + $this->order = PluginEnableOrder::fromString($plugin["load"]); }catch(\InvalidArgumentException $e){ throw new PluginException("Invalid Plugin \"load\""); } }else{ - $this->order = PluginLoadOrder::POSTWORLD(); + $this->order = PluginEnableOrder::POSTWORLD(); } $this->authors = []; @@ -281,7 +281,7 @@ class PluginDescription{ return $this->name; } - public function getOrder() : PluginLoadOrder{ + public function getOrder() : PluginEnableOrder{ return $this->order; } diff --git a/src/plugin/PluginLoadOrder.php b/src/plugin/PluginEnableOrder.php similarity index 97% rename from src/plugin/PluginLoadOrder.php rename to src/plugin/PluginEnableOrder.php index fa99eeba9..b79b19d90 100644 --- a/src/plugin/PluginLoadOrder.php +++ b/src/plugin/PluginEnableOrder.php @@ -33,7 +33,7 @@ use pocketmine\utils\EnumTrait; * @method static self STARTUP() * @method static self POSTWORLD() */ -final class PluginLoadOrder{ +final class PluginEnableOrder{ use EnumTrait; protected static function setup() : void{