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 Developers!: You will need to clean up your work/Minecraft/1.13.2 folder for this Also, restore a patch that was dropped in the last upstream Bukkit Changes: 279eeab3 Fix command description not being set 96e2bb18 Remove debug print from SyntheticEventTest CraftBukkit Changes: d3ed1516 Fix dangerously threaded beacons 217a293d Don't relocate joptsimple to allow --help to work. 1be05a21 Prepare for imminent Java 12 release a49270b2 Mappings Update 5259d80c SPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports Spigot Changes: e6eb36f2 Rebuild patches
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From f841f4e17ff60ac0f7bd13f9f0d79ae67dab8ec5 Mon Sep 17 00:00:00 2001
|
|
From: Minecrell <minecrell@minecrell.net>
|
|
Date: Tue, 17 Jul 2018 16:42:17 +0200
|
|
Subject: [PATCH] Use asynchronous Log4j 2 loggers
|
|
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index 3ad5af346..9cbd4880f 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -74,6 +74,13 @@
|
|
<artifactId>log4j-iostreams</artifactId>
|
|
<version>2.8.1</version>
|
|
</dependency>
|
|
+ <!-- Paper - Async loggers -->
|
|
+ <dependency>
|
|
+ <groupId>com.lmax</groupId>
|
|
+ <artifactId>disruptor</artifactId>
|
|
+ <version>3.4.2</version>
|
|
+ <scope>runtime</scope>
|
|
+ </dependency>
|
|
<dependency>
|
|
<groupId>org.ow2.asm</groupId>
|
|
<artifactId>asm</artifactId>
|
|
diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties
|
|
new file mode 100644
|
|
index 000000000..ee7c90784
|
|
--- /dev/null
|
|
+++ b/src/main/resources/log4j2.component.properties
|
|
@@ -0,0 +1 @@
|
|
+Log4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector
|
|
--
|
|
2.21.0
|
|
|