From 1bce5d0bc2da25dbb375a37fd5db402500447b3b Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 25 Oct 2019 21:26:22 +0100 Subject: [PATCH] PocketMine.php: move BaseClassLoader creation to where it's actually used --- src/pocketmine/PocketMine.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php index a17d9797c..f4f5c5e68 100644 --- a/src/pocketmine/PocketMine.php +++ b/src/pocketmine/PocketMine.php @@ -187,12 +187,6 @@ namespace pocketmine { set_error_handler([Utils::class, 'errorExceptionHandler']); - /* - * We now use the Composer autoloader, but this autoloader is still for loading plugins. - */ - $autoloader = new \BaseClassLoader(); - $autoloader->register(false); - $version = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER); define('pocketmine\VERSION', $version->getFullVersion(true)); @@ -275,6 +269,13 @@ namespace pocketmine { //TODO: move this to a Server field define('pocketmine\START_TIME', microtime(true)); ThreadManager::init(); + + /* + * We now use the Composer autoloader, but this autoloader is still for loading plugins. + */ + $autoloader = new \BaseClassLoader(); + $autoloader->register(false); + new Server($autoloader, $logger, \pocketmine\DATA, \pocketmine\PLUGIN_PATH); $logger->info("Stopping other threads");