From 24116ba846b9e8ea6efde18baff14b192a666d69 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 10 Jan 2018 10:59:58 +0000 Subject: [PATCH] Remove old pthreads v2 workarounds This used to cause problems in earlier versions of pthreads if PTHREADS_INHERIT_CLASSES was not used. This is no longer a problem in pthreads v3, because pthreads v3 copies passed threaded object classes under the hood, so there is no need to manually include them anymore. Additionally, the files in these paths don't exist anymore. --- src/pocketmine/Thread.php | 4 ---- src/pocketmine/Worker.php | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/pocketmine/Thread.php b/src/pocketmine/Thread.php index 40ff50985..2a838154f 100644 --- a/src/pocketmine/Thread.php +++ b/src/pocketmine/Thread.php @@ -52,10 +52,6 @@ abstract class Thread extends \Thread{ */ public function registerClassLoader(){ require(\pocketmine\PATH . "vendor/autoload.php"); - if(!interface_exists("ClassLoader", false)){ - require(\pocketmine\PATH . "src/spl/ClassLoader.php"); - require(\pocketmine\PATH . "src/spl/BaseClassLoader.php"); - } if($this->classLoader !== null){ $this->classLoader->register(false); } diff --git a/src/pocketmine/Worker.php b/src/pocketmine/Worker.php index 81365d271..f63f4b2ed 100644 --- a/src/pocketmine/Worker.php +++ b/src/pocketmine/Worker.php @@ -53,10 +53,6 @@ abstract class Worker extends \Worker{ */ public function registerClassLoader(){ require(\pocketmine\PATH . "vendor/autoload.php"); - if(!interface_exists("ClassLoader", false)){ - require(\pocketmine\PATH . "src/spl/ClassLoader.php"); - require(\pocketmine\PATH . "src/spl/BaseClassLoader.php"); - } if($this->classLoader !== null){ $this->classLoader->register(false); }