mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-15 02:09:42 +00:00
Code Issues Projects Releases Wiki Activity

Updated PluginBase::getResources() for Phar plugins

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-04-01 12:18:27 +02:00
parent e3ee317924
commit a38d300616
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pocketmine/plugin/PluginBase.php
View File

@ -159,7 +159,7 @@ abstract class PluginBase implements Plugin, CommandExecutor{
* @return bool|string Resource data, or false * @return bool|string Resource data, or false
*/ */
public function getResource($filename){ public function getResource($filename){
$filename = str_replace("\\", "/", $filename); $filename = rtrim(str_replace("\\", "/", $filename), "/");
if(file_exists($this->file . "resources/" . $filename)){ if(file_exists($this->file . "resources/" . $filename)){
return file_get_contents($this->file . "resources/" . $filename); return file_get_contents($this->file . "resources/" . $filename);
} }
@ -200,16 +200,19 @@ abstract class PluginBase implements Plugin, CommandExecutor{
* @return string[] * @return string[]
*/ */
public function getResources(){ public function getResources(){
if(!$this->isPhar()){ $resources = array();
$resources = array(); if(is_dir($this->file . "resources/")){
foreach(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->file . "resources/")) as $resource){ foreach(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->file . "resources/")) as $resource){
$resources[] = $resource; $resources[] = $resource;
} }
return $resources;
} }
return $resources;
} }
/**
* @return Config
*/
public function getConfig(){ public function getConfig(){
if(!isset($this->config)){ if(!isset($this->config)){
$this->reloadConfig(); $this->reloadConfig();