74f507f4e3
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: e461dcfe #555: Item - add getters/setters for owner/thrower CraftBukkit Changes: 055870c4 #758: Item - add getters/setters for owner/thrower
30 lines
1.4 KiB
Diff
30 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Sun, 31 May 2020 15:26:17 +0100
|
|
Subject: [PATCH] Provide a useful PluginClassLoader#toString
|
|
|
|
There are several cases where the plugin classloader may be dumped to the logs,
|
|
however, this provides no indication of the owner of the classloader, making
|
|
these messages effectively useless, this patch rectifies this
|
|
|
|
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
|
|
index 28e5c6591fb594ca79ee92480cedc8f549e3fe01..62f7a6817da079513f471e36cd79739d36a36d86 100644
|
|
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
|
|
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
|
|
@@ -209,4 +209,16 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
|
|
javaPlugin.logger = this.logger; // Paper - set logger
|
|
javaPlugin.init(loader, loader.server, description, dataFolder, file, this);
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public String toString() {
|
|
+ JavaPlugin currPlugin = plugin != null ? plugin : pluginInit;
|
|
+ return "PluginClassLoader{" +
|
|
+ "plugin=" + currPlugin +
|
|
+ ", pluginEnabled=" + (currPlugin == null ? "uninitialized" : currPlugin.isEnabled()) +
|
|
+ ", url=" + file +
|
|
+ '}';
|
|
+ }
|
|
+ // Paper end
|
|
}
|