ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2532 from open-osrs/allow-plugin-abstraction

Browse Source 
pluginmanager: allow Plugins to be instantized if they're a plugin regardless of superclass.
This commit is contained in:
ThatGamerBlue
2020-04-29 16:16:34 +01:00
committed by GitHub
parent 4df96086b5 9fb9bb1931
commit 8b6a48aae2
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runelite-client/src/main/java/net/runelite/client/plugins/ExternalPluginManager.java
View File

@@ -643,13 +643,13 @@ public class ExternalPluginManager
{ {
if (pluginDescriptor == null) if (pluginDescriptor == null)
{ {
if (clazz.getSuperclass() == Plugin.class) if (Plugin.class.isAssignableFrom(clazz))
{ {
log.warn("Class {} is a plugin, but has no plugin descriptor", clazz); log.warn("Class {} is a plugin, but has no plugin descriptor", clazz);
continue;
} }
continue;
} }
else if (clazz.getSuperclass() != Plugin.class) else if (!Plugin.class.isAssignableFrom(clazz))
{ {
log.warn("Class {} has plugin descriptor, but is not a plugin", clazz); log.warn("Class {} has plugin descriptor, but is not a plugin", clazz);
continue; continue;
@@ -1084,7 +1084,7 @@ public class ExternalPluginManager
String lastVersion = lastRelease.version; String lastVersion = lastRelease.version;
try try
{ {
RuneLiteSplashScreen.stage(.59, "Updating " + plugin.id + " to version " + lastVersion); RuneLiteSplashScreen.stage(.59, "Updating " + plugin.id + " to version " + lastVersion);
boolean updated = updateManager.updatePlugin(plugin.id, lastVersion); boolean updated = updateManager.updatePlugin(plugin.id, lastVersion);

10
runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
View File

@@ -356,18 +356,16 @@ public class PluginManager
if (pluginDescriptor == null) if (pluginDescriptor == null)
{ {
if (clazz.getSuperclass() == Plugin.class) if (Plugin.class.isAssignableFrom(clazz) && clazz != Plugin.class)
{ {
log.warn("Class {} is a plugin, but has no plugin descriptor", log.warn("Class {} is a plugin, but has no plugin descriptor", clazz);
clazz);
} }
continue; continue;
} }
if (clazz.getSuperclass() != Plugin.class) if (!Plugin.class.isAssignableFrom(clazz))
{ {
log.warn("Class {} has plugin descriptor, but is not a plugin", log.warn("Class {} has plugin descriptor, but is not a plugin", clazz);
clazz);
continue; continue;
} }