From bcc3e20c3134a8c12ee3f916a827ee58d7f07341 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Fri, 13 Dec 2019 17:58:53 +0000
Subject: [PATCH] DiskResourceProvider: do not arbitrarily suffix /resources/

---
 src/plugin/DiskResourceProvider.php | 10 +++++-----
 src/plugin/PluginManager.php        |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugin/DiskResourceProvider.php b/src/plugin/DiskResourceProvider.php
index 09a703f43..c3487bb39 100644
--- a/src/plugin/DiskResourceProvider.php
+++ b/src/plugin/DiskResourceProvider.php
@@ -55,8 +55,8 @@ class DiskResourceProvider implements ResourceProvider{
 	 */
 	public function getResource(string $filename){
 		$filename = rtrim(str_replace("\\", "/", $filename), "/");
-		if(file_exists($this->file . "/resources/" . $filename)){
-			return fopen($this->file . "/resources/" . $filename, "rb");
+		if(file_exists($this->file . "/" . $filename)){
+			return fopen($this->file . "/" . $filename, "rb");
 		}
 
 		return null;
@@ -69,10 +69,10 @@ class DiskResourceProvider implements ResourceProvider{
 	 */
 	public function getResources() : array{
 		$resources = [];
-		if(is_dir($this->file . "resources/")){
-			foreach(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->file . "resources/")) as $resource){
+		if(is_dir($this->file)){
+			foreach(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->file)) as $resource){
 				if($resource->isFile()){
-					$path = str_replace(DIRECTORY_SEPARATOR, "/", substr((string) $resource, strlen($this->file . "resources/")));
+					$path = str_replace(DIRECTORY_SEPARATOR, "/", substr((string) $resource, strlen($this->file)));
 					$resources[$path] = $resource;
 				}
 			}
diff --git a/src/plugin/PluginManager.php b/src/plugin/PluginManager.php
index 10716f9aa..e30a27534 100644
--- a/src/plugin/PluginManager.php
+++ b/src/plugin/PluginManager.php
@@ -185,7 +185,7 @@ class PluginManager{
 					 * @var Plugin $plugin
 					 * @see Plugin::__construct()
 					 */
-					$plugin = new $mainClass($loader, $this->server, $description, $dataFolder, $prefixed, new DiskResourceProvider($prefixed . "/"));
+					$plugin = new $mainClass($loader, $this->server, $description, $dataFolder, $prefixed, new DiskResourceProvider($prefixed . "/resources/"));
 					$this->plugins[$plugin->getDescription()->getName()] = $plugin;
 
 					return $plugin;