mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 12:18:46 +00:00
Code Issues Projects Releases Wiki Activity

Fixed phar plugins not reading resources correctly

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-06-13 12:07:27 +01:00
parent 78eae28a3e
commit c835c97aba
5 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/plugin/PharPluginLoader.php
View File

@ -50,7 +50,7 @@ class PharPluginLoader implements PluginLoader{
* @param string $file * @param string $file
*/ */
public function loadPlugin(string $file) : void{ public function loadPlugin(string $file) : void{
$this->loader->addPath("phar://$file/src"); $this->loader->addPath("$file/src");
} }
/** /**
@ -71,4 +71,8 @@ class PharPluginLoader implements PluginLoader{
return null; return null;
} }
public function getAccessProtocol() : string{
return "phar://";
}
} }

7
src/pocketmine/plugin/PluginLoader.php
View File

@ -52,4 +52,11 @@ interface PluginLoader{
* @return null|PluginDescription * @return null|PluginDescription
*/ */
public function getPluginDescription(string $file) : ?PluginDescription; public function getPluginDescription(string $file) : ?PluginDescription;
/**
* Returns the protocol prefix used to access files in this plugin, e.g. file://, phar://
*
* @return string
*/
public function getAccessProtocol() : string;
} }

5
src/pocketmine/plugin/PluginManager.php
View File

@ -158,7 +158,8 @@ class PluginManager{
return null; return null;
} }
$loader->loadPlugin($path); $prefixed = $loader->getAccessProtocol() . $path;
$loader->loadPlugin($prefixed);
$mainClass = $description->getMain(); $mainClass = $description->getMain();
if(!class_exists($mainClass, true)){ if(!class_exists($mainClass, true)){
@ -175,7 +176,7 @@ class PluginManager{
* @var Plugin $plugin * @var Plugin $plugin
* @see Plugin::__construct() * @see Plugin::__construct()
*/ */
$plugin = new $mainClass($loader, $this->server, $description, $dataFolder, $path); $plugin = new $mainClass($loader, $this->server, $description, $dataFolder, $prefixed);
$plugin->onLoad(); $plugin->onLoad();
$this->plugins[$plugin->getDescription()->getName()] = $plugin; $this->plugins[$plugin->getDescription()->getName()] = $plugin;

4
src/pocketmine/plugin/ScriptPluginLoader.php
View File

@ -86,4 +86,8 @@ class ScriptPluginLoader implements PluginLoader{
return null; return null;
} }
public function getAccessProtocol() : string{
return "file://";
}
} }

2
tests/plugins/PocketMine-DevTools

@ -1 +1 @@
Subproject commit 19fcbf0f9751b4d9d27cdfb007e0fb2bbf3acd04 Subproject commit 1fae225ac376c1a0f4dd57a181dbba591f62944a