mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-05 11:14:48 +02:00
459987d69f
improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
40 lines
2.2 KiB
Diff
40 lines
2.2 KiB
Diff
From 5d4638bf1ac248bb211637ffb67ab6bbc61d4d38 Mon Sep 17 00:00:00 2001
|
|
From: Minecrell <minecrell@minecrell.net>
|
|
Date: Sat, 23 Sep 2017 21:07:20 +0200
|
|
Subject: [PATCH] Disable logger prefix for various plugins bypassing the
|
|
plugin logger
|
|
|
|
Some plugins bypass the plugin logger and add the plugin prefix
|
|
manually to the log message. Since they use other logger names
|
|
(e.g. qualified class names) these would now also appear in the
|
|
log. Disable the logger prefix for these plugins so the messages
|
|
show up correctly.
|
|
|
|
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
|
|
index 9f8334376f..6711e6dff9 100644
|
|
--- a/src/main/resources/log4j2.xml
|
|
+++ b/src/main/resources/log4j2.xml
|
|
@@ -5,7 +5,8 @@
|
|
<PatternLayout>
|
|
<LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level]: [%logger] %minecraftFormatting{%msg}%n%xEx}">
|
|
<!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix -->
|
|
- <PatternMatch key=",net.minecraft.,Minecraft,com.mojang."
|
|
+ <!-- Disable prefix for various plugins that bypass the plugin logger -->
|
|
+ <PatternMatch key=",net.minecraft.,Minecraft,com.mojang.,com.sk89q.,ru.tehkode.,Minecraft.AWE"
|
|
pattern="%highlightError{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx}" />
|
|
</LoggerNamePatternSelector>
|
|
</PatternLayout>
|
|
@@ -14,7 +15,8 @@
|
|
<PatternLayout>
|
|
<LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level]: [%logger] %minecraftFormatting{%msg}{strip}%n">
|
|
<!-- Log root, Minecraft, Mojang and Bukkit loggers without prefix -->
|
|
- <PatternMatch key=",net.minecraft.,Minecraft,com.mojang."
|
|
+ <!-- Disable prefix for various plugins that bypass the plugin logger -->
|
|
+ <PatternMatch key=",net.minecraft.,Minecraft,com.mojang.,com.sk89q.,ru.tehkode.,Minecraft.AWE"
|
|
pattern="[%d{HH:mm:ss}] [%t/%level]: %minecraftFormatting{%msg}{strip}%n" />
|
|
</LoggerNamePatternSelector>
|
|
</PatternLayout>
|
|
--
|
|
2.19.0
|
|
|