From 97f4798d515408f48a9aa65388b56aded43eafa9 Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Tue, 8 Mar 2011 18:20:34 +0000 Subject: [PATCH] Reverted classloader changes by 1f0d89be27, now actually works! Again! By: Dinnerbone --- .../bukkit/plugin/java/PluginClassLoader.java | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/paper-api/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java index bc6cb0a2b1..d17e0f4f87 100644 --- a/paper-api/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/paper-api/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -24,25 +24,17 @@ public class PluginClassLoader extends URLClassLoader { Class result = classes.get(name); if (result == null) { - ClassNotFoundException ex = null; + result = loader.getClassByName(name); - try { + if (result == null) { result = super.findClass(name); - } catch (ClassNotFoundException e) { - ex = e; + + if (result != null) { + loader.setClass(name, result); + } } - if (result != null) { - loader.setClass(name, result); - } else { - result = loader.getClassByName(name); - } - - if (result != null ) { - classes.put(name, result); - } else { - throw ex; - } + classes.put(name, result); } return result;