Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
0976d52bbd
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 Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes:8d8475fcSPIGOT-4666: Force parameter in HumanEntity#sleep8b1588e2Fix ExplosionPrimeEvent#setFire not working with EnderCrystals39a287b7Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
45 Zeilen
1.9 KiB
Diff
45 Zeilen
1.9 KiB
Diff
From 6b3735bc5ec6609bb14a78335eaa7ea5c5574db4 Mon Sep 17 00:00:00 2001
|
|
From: Minecrell <minecrell@minecrell.net>
|
|
Date: Thu, 21 Sep 2017 16:14:13 +0200
|
|
Subject: [PATCH] Handle plugin prefixes in implementation logging
|
|
configuration
|
|
|
|
Currently, plugin prefixes are prepended to the log message in
|
|
the PluginLogger before passing the message to the underlying
|
|
logging framework. This is bad design because they need to be
|
|
stripped manually when using custom appenders to log messages
|
|
in a different format.
|
|
|
|
Additionally, it makes integration of alternative logging APIs hard
|
|
because all logging must go through the PluginLogger. Avoid using
|
|
PluginLogger and create a regular logger using the plugin name.
|
|
The implementation should handle plugin prefixes by displaying
|
|
logger names when appropriate.
|
|
|
|
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
|
|
index 7c934899..9a342788 100644
|
|
--- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
|
|
+++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
|
|
@@ -44,7 +44,7 @@ public abstract class JavaPlugin extends PluginBase {
|
|
private boolean naggable = true;
|
|
private FileConfiguration newConfig = null;
|
|
private File configFile = null;
|
|
- private PluginLogger logger = null;
|
|
+ private Logger logger = null; // Paper - PluginLogger -> Logger
|
|
|
|
public JavaPlugin() {
|
|
final ClassLoader classLoader = this.getClass().getClassLoader();
|
|
@@ -278,7 +278,8 @@ public abstract class JavaPlugin extends PluginBase {
|
|
this.dataFolder = dataFolder;
|
|
this.classLoader = classLoader;
|
|
this.configFile = new File(dataFolder, "config.yml");
|
|
- this.logger = new PluginLogger(this);
|
|
+ // Paper - Handle plugin prefix in implementation
|
|
+ this.logger = Logger.getLogger(description.getPrefix() != null ? description.getPrefix() : description.getName());
|
|
}
|
|
|
|
/**
|
|
--
|
|
2.21.0
|
|
|