diff options
| author | md_5 <git@md-5.net> | 2018-07-30 09:18:55 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2018-07-30 09:18:55 +1000 |
| commit | 00678ff63c5c18da89790a4c8f53d5c5f55df5ed (patch) | |
| tree | 6e175836efbbf1801d36b9b1114080dd4ddffc54 | |
| parent | 235aa19c407f548f8f9b75394b5012dc5b861820 (diff) | |
| download | bukkit-00678ff63c5c18da89790a4c8f53d5c5f55df5ed.tar bukkit-00678ff63c5c18da89790a4c8f53d5c5f55df5ed.tar.gz bukkit-00678ff63c5c18da89790a4c8f53d5c5f55df5ed.tar.lz bukkit-00678ff63c5c18da89790a4c8f53d5c5f55df5ed.tar.xz bukkit-00678ff63c5c18da89790a4c8f53d5c5f55df5ed.zip | |
Include class path in legacy conversion errors.
| -rw-r--r-- | src/main/java/org/bukkit/UnsafeValues.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/plugin/java/PluginClassLoader.java | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java index 20b3a9ee..f1188b05 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/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/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java index a0fa3191..154481af 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/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) { |