mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
9940dcf74b
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@841da90 Paper Plugins (#8108) PaperMC/Paper@7baf427 Fix plugin updater logic, allow null update directory (#8864)
47 lines
2.4 KiB
Diff
47 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Krakenied <Krakenied1@gmail.com>
|
|
Date: Fri, 14 Oct 2022 23:11:27 +0200
|
|
Subject: [PATCH] Add log suppression for LibraryLoader
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
|
index 90fdaee8b07df0acf8863103b47a1c68e38a3e4f..6319f6c1428d0e272681984c1b15ec05a3272423 100644
|
|
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
|
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
|
@@ -55,6 +55,7 @@ public final class JavaPluginLoader implements PluginLoader {
|
|
private final Pattern[] fileFilters = new Pattern[]{Pattern.compile("\\.jar$")};
|
|
private final List<PluginClassLoader> loaders = new CopyOnWriteArrayList<PluginClassLoader>();
|
|
private final LibraryLoader libraryLoader;
|
|
+ public static boolean SuppressLibraryLoaderLogger = false; // Purpur
|
|
|
|
/**
|
|
* This class was not meant to be constructed explicitly
|
|
diff --git a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
|
index f9e67e20133d349e43d126dbb48b34d4d9aceb4c..f8efacb9447d72e66a1fd59db18425fe0629e266 100644
|
|
--- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
|
+++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
|
@@ -65,6 +65,7 @@ public class LibraryLoader
|
|
@Override
|
|
public void transferStarted(@NotNull TransferEvent event) throws TransferCancelledException
|
|
{
|
|
+ if (!JavaPluginLoader.SuppressLibraryLoaderLogger) // Purpur
|
|
logger.log( Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName() );
|
|
}
|
|
} );
|
|
@@ -80,6 +81,7 @@ public class LibraryLoader
|
|
{
|
|
return null;
|
|
}
|
|
+ if (!JavaPluginLoader.SuppressLibraryLoaderLogger) // Purpur
|
|
logger.log( Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[]
|
|
{
|
|
desc.getName(), desc.getLibraries().size()
|
|
@@ -118,6 +120,7 @@ public class LibraryLoader
|
|
}
|
|
|
|
jarFiles.add( url );
|
|
+ if (!JavaPluginLoader.SuppressLibraryLoaderLogger) // Purpur
|
|
logger.log( Level.INFO, "[{0}] Loaded library {1}", new Object[]
|
|
{
|
|
desc.getName(), file
|