From 242582acc7ea5ae2d6d8a36b401a5ce9ff2726a9 Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Fri, 25 May 2012 15:47:39 -0500 Subject: [PATCH] Make class loader preference predictable; Fixes BUKKIT-1591 By: Wesley Wolfe --- .../src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java index cb0055b4f..38ca9422c 100644 --- a/paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -10,6 +10,7 @@ import java.lang.reflect.Method; import java.net.URL; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -49,7 +50,7 @@ public class JavaPluginLoader implements PluginLoader { private final Server server; protected final Pattern[] fileFilters = new Pattern[] { Pattern.compile("\\.jar$"), }; protected final Map> classes = new HashMap>(); - protected final Map loaders = new HashMap(); + protected final Map loaders = new LinkedHashMap(); public JavaPluginLoader(Server instance) { server = instance;