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

Fixed plugin schedulers crashing after disable/reenable

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-05-31 12:34:22 +01:00
parent 05ef13b23a
commit 15270f8329
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/pocketmine/plugin/PluginManager.php
View File

@ -575,6 +575,7 @@ class PluginManager{
foreach($plugin->getDescription()->getPermissions() as $perm){ foreach($plugin->getDescription()->getPermissions() as $perm){
$this->addPermission($perm); $this->addPermission($perm);
} }
$plugin->getScheduler()->setEnabled(true);
$plugin->getPluginLoader()->enablePlugin($plugin); $plugin->getPluginLoader()->enablePlugin($plugin);
}catch(\Throwable $e){ }catch(\Throwable $e){
$this->server->getLogger()->logException($e); $this->server->getLogger()->logException($e);

10
src/pocketmine/scheduler/TaskScheduler.php
View File

@ -36,7 +36,7 @@ class TaskScheduler{
private $owner; private $owner;
/** @var bool */ /** @var bool */
private $shutdown = false; private $enabled = true;
/** /**
* @var ReversePriorityQueue<Task> * @var ReversePriorityQueue<Task>
@ -146,7 +146,7 @@ class TaskScheduler{
* @throws \InvalidStateException * @throws \InvalidStateException
*/ */
private function addTask(Task $task, int $delay, int $period){ private function addTask(Task $task, int $delay, int $period){
if($this->shutdown){ if(!$this->enabled){
throw new \InvalidStateException("Tried to schedule task after scheduler shutdown"); throw new \InvalidStateException("Tried to schedule task after scheduler shutdown");
} }
@ -178,10 +178,14 @@ class TaskScheduler{
} }
public function shutdown() : void{ public function shutdown() : void{
$this->shutdown = true; $this->enabled = false;
$this->cancelAllTasks(); $this->cancelAllTasks();
} }
public function setEnabled(bool $enabled) : void{
$this->enabled = $enabled;
}
/** /**
* @param int $currentTick * @param int $currentTick
*/ */