diff --git a/patches/api/Paper-Plugins.patch b/patches/api/Paper-Plugins.patch index 2d51ba3c24..bbe281c5ff 100644 --- a/patches/api/Paper-Plugins.patch +++ b/patches/api/Paper-Plugins.patch @@ -2013,6 +2013,24 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 { private final Logger logger; +@@ -0,0 +0,0 @@ class LibraryLoader + } + logger.log( Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[] + { +- desc.getName(), desc.getLibraries().size() ++ java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), desc.getLibraries().size() // Paper - use configured log prefix + } ); + + List dependencies = new ArrayList<>(); +@@ -0,0 +0,0 @@ class LibraryLoader + jarFiles.add( url ); + logger.log( Level.INFO, "[{0}] Loaded library {1}", new Object[] + { +- desc.getName(), file ++ java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), file // Paper - use configured log prefix + } ); + } + diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java