Fix Plugin Resource Loading

bundabrg · Jul 7, 2020 · 7e62e7c · 7e62e7c
1 parent 1d5924c
commit 7e62e7c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/connector/src/main/java/org/geysermc/connector/plugin/GeyserPlugin.java b/connector/src/main/java/org/geysermc/connector/plugin/GeyserPlugin.java
@@ -177,6 +177,6 @@ public File getDataFolder() {
      * Return an InputStream for a resource file
      */
     public InputStream getResourceAsStream(String name) {
-        return getClass().getClassLoader().getResourceAsStream(name);
+        return getPluginClassLoader().getResourceAsStream(name);
     }
 }
diff --git a/connector/src/main/java/org/geysermc/connector/plugin/PluginClassLoader.java b/connector/src/main/java/org/geysermc/connector/plugin/PluginClassLoader.java
@@ -187,6 +187,21 @@ protected Class<?> findClass(String name) throws ClassNotFoundException {
         return cls;
     }
 
+    @Override
+    public URL getResource(String name) {
+        return findResource(name);
+    }
+
+    @Override
+    public Enumeration<URL> getResources(String name) throws IOException {
+        return findResources(name);
+    }
+
+    @Override
+    public InputStream getResourceAsStream(String name) {
+        return super.getResourceAsStream(name);
+    }
+
     public static class InvalidPluginClassLoaderException extends Exception {
         InvalidPluginClassLoaderException(String msg) {
             super(msg);