From f3f25a351f2f2a405b8624bc354c43edf661c307 Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Mon, 30 Jul 2018 09:18:55 +1000 Subject: [PATCH] Include class path in legacy conversion errors. By: md_5 --- paper-api/src/main/java/org/bukkit/UnsafeValues.java | 2 +- .../main/java/org/bukkit/plugin/java/PluginClassLoader.java | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/UnsafeValues.java b/paper-api/src/main/java/org/bukkit/UnsafeValues.java index 20b3a9eec..f1188b052 100644 --- a/paper-api/src/main/java/org/bukkit/UnsafeValues.java +++ b/paper-api/src/main/java/org/bukkit/UnsafeValues.java @@ -31,7 +31,7 @@ public interface UnsafeValues { void checkSupported(PluginDescriptionFile pdf); - byte[] processClass(PluginDescriptionFile pdf, byte[] clazz); + byte[] processClass(PluginDescriptionFile pdf, String path, byte[] clazz); /** * Load an advancement represented by the specified string into the server. 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 a0fa3191b..154481af1 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 @@ -100,11 +100,7 @@ final class PluginClassLoader extends URLClassLoader { throw new ClassNotFoundException(name, ex); } - try { - classBytes = loader.server.getUnsafe().processClass(description, classBytes); - } catch (Exception ex) { - throw new ClassNotFoundException(name, ex); - } + classBytes = loader.server.getUnsafe().processClass(description, path, classBytes); int dot = name.lastIndexOf('.'); if (dot != -1) {