Skip to content

Commit

Permalink
Update composer name to nethergamesmc/libasynql
Browse files Browse the repository at this point in the history
  • Loading branch information
dries-c committed Mar 27, 2024
1 parent 7893751 commit ed06f3b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
7 changes: 5 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "sof3/libasynql",
"name": "nethergamesmc/libasynql",
"type": "library",
"require": {
"sof3/await-generator": "^2.0.0 || ^3.0.0"
},
"require-dev": {
"pocketmine/pocketmine-mp": "^5.0.0-BETA4"
"nethergamesmc/pocketmine-mp": "dev-stable"
},
"license": "Apache-2.0",
"autoload": {
Expand All @@ -19,6 +19,9 @@
"email": "[email protected]"
}
],
"repositories": [
{ "type": "vcs", "url": "[email protected]:NetherGamesMC/PocketMine-MP.git" }
],
"bin": [
"libasynql/cli/def.php",
"libasynql/cli/fx.php"
Expand Down
10 changes: 7 additions & 3 deletions libasynql/src/poggit/libasynql/base/SqlSlaveThread.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,13 @@ protected function __construct(SleeperHandlerEntry $entry, QuerySendQueue $buffe

if(!libasynql::isPackaged()){
/** @noinspection NullPointerExceptionInspection */
/** @var ClassLoader $cl */
$cl = Server::getInstance()->getPluginManager()->getPlugin("DEVirion")->getVirionClassLoader();
$this->setClassLoaders([Server::getInstance()->getLoader(), $cl]);
/** @var ?ClassLoader $cl */
$cl = Server::getInstance()->getPluginManager()->getPlugin("DEVirion")?->getVirionClassLoader();
if($cl === null){
$this->setClassLoaders([Server::getInstance()->getLoader()]);
}else{
$this->setClassLoaders([Server::getInstance()->getLoader(), $cl]);
}
}
$this->start(NativeThread::INHERIT_INI);
}
Expand Down

0 comments on commit ed06f3b

Please sign in to comment.