From c05116849ad47d08bd2d1708a3b8d9e05df27368 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Thu, 21 Dec 2023 12:38:51 +0000
Subject: [PATCH] AsyncWorker: clean up nonsensical sleeper notifier handling
 code

---
 src/scheduler/AsyncTask.php   |  6 +-----
 src/scheduler/AsyncWorker.php | 13 ++++++-------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/scheduler/AsyncTask.php b/src/scheduler/AsyncTask.php
index b4c3ce20db..b0b64347ad 100644
--- a/src/scheduler/AsyncTask.php
+++ b/src/scheduler/AsyncTask.php
@@ -24,12 +24,10 @@ declare(strict_types=1);
 namespace pocketmine\scheduler;
 
 use pmmp\thread\Runnable;
-use pmmp\thread\Thread as NativeThread;
 use pmmp\thread\ThreadSafe;
 use pmmp\thread\ThreadSafeArray;
 use pocketmine\thread\NonThreadSafeValue;
 use function array_key_exists;
-use function assert;
 use function igbinary_serialize;
 use function igbinary_unserialize;
 use function is_null;
@@ -83,9 +81,7 @@ abstract class AsyncTask extends Runnable{
 		$this->onRun();
 
 		$this->finished = true;
-		$worker = NativeThread::getCurrentThread();
-		assert($worker instanceof AsyncWorker);
-		$worker->getNotifier()->wakeupSleeper();
+		AsyncWorker::getNotifier()->wakeupSleeper();
 	}
 
 	/**
diff --git a/src/scheduler/AsyncWorker.php b/src/scheduler/AsyncWorker.php
index 919e3eedcf..0f05dd8969 100644
--- a/src/scheduler/AsyncWorker.php
+++ b/src/scheduler/AsyncWorker.php
@@ -36,7 +36,7 @@ class AsyncWorker extends Worker{
 	/** @var mixed[] */
 	private static array $store = [];
 
-	private const TLS_KEY_NOTIFIER = self::class . "::notifier";
+	private static ?SleeperNotifier $notifier = null;
 
 	public function __construct(
 		private ThreadSafeLogger $logger,
@@ -45,12 +45,11 @@ class AsyncWorker extends Worker{
 		private SleeperHandlerEntry $sleeperEntry
 	){}
 
-	public function getNotifier() : SleeperNotifier{
-		$notifier = $this->getFromThreadStore(self::TLS_KEY_NOTIFIER);
-		if(!$notifier instanceof SleeperNotifier){
-			throw new AssumptionFailedError("SleeperNotifier not found in thread-local storage");
+	public static function getNotifier() : SleeperNotifier{
+		if(self::$notifier !== null){
+			return self::$notifier;
 		}
-		return $notifier;
+		throw new AssumptionFailedError("SleeperNotifier not found in thread-local storage");
 	}
 
 	protected function onRun() : void{
@@ -66,7 +65,7 @@ class AsyncWorker extends Worker{
 			$this->logger->debug("No memory limit set");
 		}
 
-		$this->saveToThreadStore(self::TLS_KEY_NOTIFIER, $this->sleeperEntry->createNotifier());
+		self::$notifier = $this->sleeperEntry->createNotifier();
 	}
 
 	public function getLogger() : ThreadSafeLogger{