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

Merge branch 'release/3.2'

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-08-03 20:08:01 +01:00
commit 2cb6307e5b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/scheduler/AsyncPool.php
View File

@ -308,7 +308,7 @@ class AsyncPool{
} }
$this->removeTask($task); $this->removeTask($task);
}elseif($task->isTerminated() or $task->isCrashed()){ }elseif($task->isCrashed()){
$this->logger->critical("Could not execute asynchronous task " . (new \ReflectionClass($task))->getShortName() . ": Task crashed"); $this->logger->critical("Could not execute asynchronous task " . (new \ReflectionClass($task))->getShortName() . ": Task crashed");
$this->removeTask($task, true); $this->removeTask($task, true);
} }

2
src/pocketmine/scheduler/AsyncTask.php
View File

@ -80,7 +80,7 @@ abstract class AsyncTask extends Collectable{
} }
public function isCrashed() : bool{ public function isCrashed() : bool{
return $this->crashed; return $this->crashed or $this->isTerminated();
} }
/** /**