mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-13 06:55:29 +00:00
Code Issues Projects Releases Wiki Activity

Remove useless checks for plugins disabling other plugins (#5931)

Browse Source
This commit is contained in:
Javier León 2023-07-24 07:31:19 -03:00 committed by GitHub
parent 2ab3393568
commit b944205f60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugin/PluginManager.php
View File

@ -490,9 +490,6 @@ class PluginManager{
public function disablePlugins() : void{ public function disablePlugins() : void{
while(count($this->enabledPlugins) > 0){ while(count($this->enabledPlugins) > 0){
foreach($this->enabledPlugins as $plugin){ foreach($this->enabledPlugins as $plugin){
if(!$plugin->isEnabled()){
continue; //in case a plugin disabled another plugin
}
$name = $plugin->getDescription()->getName(); $name = $plugin->getDescription()->getName();
if(isset($this->pluginDependents[$name]) && count($this->pluginDependents[$name]) > 0){ if(isset($this->pluginDependents[$name]) && count($this->pluginDependents[$name]) > 0){
$this->server->getLogger()->debug("Deferring disable of plugin $name due to dependent plugins still enabled: " . implode(", ", array_keys($this->pluginDependents[$name]))); $this->server->getLogger()->debug("Deferring disable of plugin $name due to dependent plugins still enabled: " . implode(", ", array_keys($this->pluginDependents[$name])));
@ -525,11 +522,7 @@ class PluginManager{
public function tickSchedulers(int $currentTick) : void{ public function tickSchedulers(int $currentTick) : void{
foreach($this->enabledPlugins as $pluginName => $p){ foreach($this->enabledPlugins as $pluginName => $p){
if(isset($this->enabledPlugins[$pluginName])){ $p->getScheduler()->mainThreadHeartbeat($currentTick);
//the plugin may have been disabled as a result of updating other plugins' schedulers, and therefore
//removed from enabledPlugins; however, foreach will still see it due to copy-on-write
$p->getScheduler()->mainThreadHeartbeat($currentTick);
}
} }
} }