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

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2020-06-04 11:30:45 +02:00
parent a3bdca6df7 a803ba567b
commit 5b45c860ec
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
http-api/src/main/java/net/runelite/http/api/ge/GrandExchangeTrade.java
View File

@@ -38,5 +38,6 @@ public class GrandExchangeTrade
private int total; private int total;
private int spent; private int spent;
private int offer; private int offer;
private int slot;
private WorldType worldType; private WorldType worldType;
} }

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

@@ -449,10 +449,13 @@ public class ExternalPluginManager
net.runelite.client.plugins.PluginDependency[] pluginDependencies = pluginClazz.getAnnotationsByType(net.runelite.client.plugins.PluginDependency.class); net.runelite.client.plugins.PluginDependency[] pluginDependencies = pluginClazz.getAnnotationsByType(net.runelite.client.plugins.PluginDependency.class);
for (net.runelite.client.plugins.PluginDependency pluginDependency : pluginDependencies) for (net.runelite.client.plugins.PluginDependency pluginDependency : pluginDependencies)
{
if (graph.nodes().contains(pluginDependency.value()))
{ {
graph.putEdge(pluginClazz, pluginDependency.value()); graph.putEdge(pluginClazz, pluginDependency.value());
} }
} }
}
if (Graphs.hasCycle(graph)) if (Graphs.hasCycle(graph))
{ {

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

@@ -385,10 +385,13 @@ public class PluginManager
PluginDependency[] pluginDependencies = pluginClazz.getAnnotationsByType(PluginDependency.class); PluginDependency[] pluginDependencies = pluginClazz.getAnnotationsByType(PluginDependency.class);
for (PluginDependency pluginDependency : pluginDependencies) for (PluginDependency pluginDependency : pluginDependencies)
{
if (graph.nodes().contains(pluginDependency.value()))
{ {
graph.putEdge(pluginClazz, pluginDependency.value()); graph.putEdge(pluginClazz, pluginDependency.value());
} }
} }
}
if (Graphs.hasCycle(graph)) if (Graphs.hasCycle(graph))
{ {