mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
3d52f066c1
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@848a396 Add mob goal generator (#9980) PaperMC/Paper@ebf97bd [ci skip] Add more patch identifying comments PaperMC/Paper@94807a1 [ci skip] Minor cleanup and patch merges
47 lines
2.6 KiB
Diff
47 lines
2.6 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 301e82369603f3dd6e6c1bd380da4bacacd7ef6c..0c6ca7588fb3d6b6497ddf032fe75e5c6c9719e5 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 653135352c104a6ddeb74a1b6d4916c6952d6271..46b0d02aa759b3735e6ac811523d459cf263aa8b 100644
|
|
--- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
|
+++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
|
@@ -66,6 +66,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() );
|
|
}
|
|
} );
|
|
@@ -81,6 +82,7 @@ public class LibraryLoader
|
|
{
|
|
return null;
|
|
}
|
|
+ if (!JavaPluginLoader.SuppressLibraryLoaderLogger) // Purpur
|
|
logger.log( Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[]
|
|
{
|
|
java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), desc.getLibraries().size() // Paper - use configured log prefix
|
|
@@ -119,6 +121,7 @@ public class LibraryLoader
|
|
}
|
|
|
|
jarFiles.add( url );
|
|
+ if (!JavaPluginLoader.SuppressLibraryLoaderLogger) // Purpur
|
|
logger.log( Level.INFO, "[{0}] Loaded library {1}", new Object[]
|
|
{
|
|
java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), file // Paper - use configured log prefix
|