From 7ba193dc2e0c52420aaa0dc95ff04d12e0f13215 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 28 Sep 2017 18:01:31 +0100 Subject: [PATCH] Set ErrorException handler on AsyncWorkers --- src/pocketmine/PocketMine.php | 6 ++++-- src/pocketmine/scheduler/AsyncWorker.php | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php index 43f8749b7..5b06bcf66 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -105,13 +105,15 @@ namespace pocketmine { error_reporting(-1); - set_error_handler(function($severity, $message, $file, $line){ + function error_handler($severity, $message, $file, $line){ if(error_reporting() & $severity){ throw new \ErrorException($message, 0, $severity, $file, $line); }else{ //stfu operator return true; } - }); + } + + set_error_handler('\pocketmine\error_handler'); if(!extension_loaded("phar")){ echo "[CRITICAL] Unable to find the Phar extension." . PHP_EOL; diff --git a/src/pocketmine/scheduler/AsyncWorker.php b/src/pocketmine/scheduler/AsyncWorker.php index 57d41d5c1..85be614be 100644 --- a/src/pocketmine/scheduler/AsyncWorker.php +++ b/src/pocketmine/scheduler/AsyncWorker.php @@ -41,6 +41,9 @@ class AsyncWorker extends Worker{ } public function run(){ + error_reporting(-1); + set_error_handler('\pocketmine\error_handler'); + $this->registerClassLoader(); $this->logger->registerStatic(); gc_enable();