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

Merge pull request #2500 from open-osrs/ext

Browse Source 
externals: catch invalid plugintype exceptions
This commit is contained in:
Kyle
2020-04-11 15:44:11 +01:00
committed by GitHub
parent e36258abe3 7f7c61086e
commit d73f64d372
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,6 +119,7 @@ public class ExternalPluginManager
@Getter(AccessLevel.PUBLIC) @Getter(AccessLevel.PUBLIC)
private UpdateManager updateManager; private UpdateManager updateManager;
private Map<String, PluginInfo.PluginRelease> lastPluginRelease = new HashMap<>(); private Map<String, PluginInfo.PluginRelease> lastPluginRelease = new HashMap<>();
private Set<PluginType> pluginTypes = Set.of(PluginType.values());
@Inject @Inject
public ExternalPluginManager( public ExternalPluginManager(
@@ -638,6 +639,8 @@ public class ExternalPluginManager
Class<? extends Plugin> clazz = plugin.getClass(); Class<? extends Plugin> clazz = plugin.getClass();
PluginDescriptor pluginDescriptor = clazz.getAnnotation(PluginDescriptor.class); PluginDescriptor pluginDescriptor = clazz.getAnnotation(PluginDescriptor.class);
try
{
if (pluginDescriptor == null) if (pluginDescriptor == null)
{ {
if (clazz.getSuperclass() == Plugin.class) if (clazz.getSuperclass() == Plugin.class)
@@ -651,6 +654,16 @@ public class ExternalPluginManager
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;
} }
else if (!pluginTypes.contains(pluginDescriptor.type()))
{
continue;
}
}
catch (EnumConstantNotPresentException e)
{
log.warn("{} has an invalid plugin type of {}", clazz, e.getMessage());
continue;
}
List<Future<?>> curGroup = new ArrayList<>(); List<Future<?>> curGroup = new ArrayList<>();
curGroup.add(exec.submit(() -> curGroup.add(exec.submit(() ->