From 5a7e575c3a3106a6d94c9eb717fbd6b76e19595f Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 3 Aug 2018 20:06:41 +0100 Subject: [PATCH 1/2] AsyncPool: isCrashed() now returns true when a fatal error occurred the fix for chunks earlier didn't fix... --- src/pocketmine/scheduler/AsyncTask.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/scheduler/AsyncTask.php b/src/pocketmine/scheduler/AsyncTask.php index 5adde88a9..6e4a517d5 100644 --- a/src/pocketmine/scheduler/AsyncTask.php +++ b/src/pocketmine/scheduler/AsyncTask.php @@ -80,7 +80,7 @@ abstract class AsyncTask extends Collectable{ } public function isCrashed() : bool{ - return $this->crashed; + return $this->crashed or $this->isTerminated(); } /** From 87f458f9bd254558f60d0d3d47eba9d22d91dbf6 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 3 Aug 2018 20:07:37 +0100 Subject: [PATCH 2/2] AsyncPool: remove now-unnecessary isTerminated() call --- src/pocketmine/scheduler/AsyncPool.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/scheduler/AsyncPool.php b/src/pocketmine/scheduler/AsyncPool.php index f833c4813..94c7c2aa3 100644 --- a/src/pocketmine/scheduler/AsyncPool.php +++ b/src/pocketmine/scheduler/AsyncPool.php @@ -295,7 +295,7 @@ class AsyncPool{ } $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->removeTask($task, true); }