From d4530548cd33ebfd335b8b44f21f4d195b43fdb5 Mon Sep 17 00:00:00 2001 From: ImNoOSRS <69985903+ImNoOSRS@users.noreply.github.com> Date: Mon, 23 Nov 2020 16:36:35 +0100 Subject: [PATCH 1/2] PluginManager: Reverse the loading of plugins. When loading plugins in the default order, lets say Wintertodt-0.0.1.jar Wintertodt-0.0.2.jar Wintertodt-0.0.3.jar It would load 0.0.1 then detect 0.0.2 and 0.0.3 as duplicates. By reversing this it would load the newest one and detect the old ones as duplicate. --- .../net/runelite/client/plugins/ExternalPf4jPluginManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPf4jPluginManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPf4jPluginManager.java index 7afac2dc40..5efafa4ef3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPf4jPluginManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPf4jPluginManager.java @@ -125,6 +125,7 @@ class ExternalPf4jPluginManager extends DefaultPluginManager } List pluginPaths = pluginRepository.getPluginPaths(); + Collections.reverse(pluginPaths); if (pluginPaths.isEmpty()) { From bf310496ef7e86df055583e719eb479933ef09dc Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Mon, 23 Nov 2020 16:47:00 +0100 Subject: [PATCH 2/2] externalpf4jpluginmanager: Add import --- .../net/runelite/client/plugins/ExternalPf4jPluginManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPf4jPluginManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPf4jPluginManager.java index 5efafa4ef3..f8043a3777 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPf4jPluginManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ExternalPf4jPluginManager.java @@ -6,6 +6,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Map;