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

Merge branch 'stable' into next-minor

Browse Source
This commit is contained in:
Dylan K. Taylor
2022-03-03 18:50:12 +00:00
parent eff856d8e5 dfd8c4e4b8
commit 2b81b53dfa
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugin/PluginManager.php
View File

@@ -435,10 +435,11 @@ class PluginManager{
$plugin->getScheduler()->setEnabled(true);
$plugin->onEnableStateChange(true);
if($plugin->isEnabled()){ //the plugin may have disabled itself during onEnable()
$this->enabledPlugins[$plugin->getDescription()->getName()] = $plugin;
$this->enabledPlugins[$plugin->getDescription()->getName()] = $plugin;
(new PluginEnableEvent($plugin))->call();
(new PluginEnableEvent($plugin))->call();
}
}
}

3
src/scheduler/TaskScheduler.php
View File

@@ -130,6 +130,9 @@ class TaskScheduler{
}
public function mainThreadHeartbeat(int $currentTick) : void{
if(!$this->enabled){
throw new \LogicException("Cannot run heartbeat on a disabled scheduler");
}
$this->currentTick = $currentTick;
while($this->isReady($this->currentTick)){
/** @var TaskHandler $task */